X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/47789aee7aaecd9205b4a8f73a699289104c6c56..15b5e9e7aeec9601880e8155f18217f7b84667aa:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 42a0ef3ba..129076f75 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -167,9 +167,10 @@ sub isinlinableimage ($) {
 	$file=~/\.(png|gif|jpg|jpeg)$/;
 }
 
-sub htmllink ($$) {
+sub htmllink {
 	my $page=shift;
 	my $link=shift;
+	my $noimagelink=shift;
 
 	my $bestlink=bestlink($page, $link);
 
@@ -188,7 +189,7 @@ sub htmllink ($$) {
 	
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
-	if (isinlinableimage($bestlink)) {
+	if (! $noimagelink && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\">";
 	}
 	return "<a href=\"$bestlink\">$link</a>";
@@ -396,7 +397,7 @@ sub rcs_recentchanges ($) {
 				$when=concise(ago(time - str2time($3)));
 		    	}
 			elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
-				push @pages, pagename($1);
+				push @pages, pagename($1) if length $1;
 			}
 			elsif ($state eq 'header' && /^$/) {
 				$state='body';
@@ -404,7 +405,7 @@ sub rcs_recentchanges ($) {
 			elsif ($state eq 'body' && /$div/) {
 				push @ret, { rev => $rev, user => $user,
 					when => $when, message => $message,
-					pages => [@pages] };
+					pages => [@pages] } if @pages;
 				return @ret if @ret >= $num;
 				
 				$state='header';
@@ -644,12 +645,10 @@ sub cgi () {
 		my $list="<ul>\n";
 		foreach my $change (rcs_recentchanges(100)) {
 			$list.="<li>";
-			foreach my $page (@{$change->{pages}}) {
-				$list.=$page." ";
-			}
+			$list.=join(", ", map { htmllink("index", $_, 1) } @{$change->{pages}});
 			$list.="<br>\n";
 			$list.="changed ".$change->{when}." by ".
-			       htmllink("index", $change->{user}).
+			       htmllink("index", $change->{user}, 1).
 			       ": <i>".$change->{message}."</i>\n";
 			$list.="</li>\n";
 		}