X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9f1cd89bc2f33b1783bc300bc5eaebe4abcf393c..723a10b5b16d87f118bea4c6afaa8d5f60ba5947:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 3d1458081..b28ad27a8 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -155,22 +155,28 @@ sub preprocess_inline (@) { #{{{
 	
 	my $feednum="";
 
-	my $feedid=join(",", map { "$_=$params{$_}" } sort keys %params);
+	my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
 	if (exists $knownfeeds{$feedid}) {
 		$feednum=$knownfeeds{$feedid};
 	}
 	else {
 		if (exists $page_numfeeds{$params{destpage}}) {
-			$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			if ($feeds) {
+				$feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+			}
 		}
 		else {
 			$feednum=$knownfeeds{$feedid}="";
-			$page_numfeeds{$params{destpage}}=1;
+			if ($feeds) {
+				$page_numfeeds{$params{destpage}}=1;
+			}
 		}
 	}
 
-	my $rssurl=basename(rsspage($params{destpage}).$feednum);
-	my $atomurl=basename(atompage($params{destpage}).$feednum);
+	if ($feeds) {
+		my $rssurl=basename(rsspage($params{destpage}).$feednum);
+		my $atomurl=basename(atompage($params{destpage}).$feednum);
+	}
 	my $ret="";
 
 	if ($config{cgiurl} && (exists $params{rootpage} ||
@@ -221,7 +227,7 @@ sub preprocess_inline (@) { #{{{
 				}
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 				$template->param(title => pagetitle(basename($page)));
-				$template->param(ctime => displaytime($pagectime{$page}));
+				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
 	
 				if ($actions) {
 					my $file = $pagesources{$page};