foo

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 1b282abf938f63f0fa604e245ad877018e7740f2..129076f759403a4d875514f991ac94c5f756571d 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -167,9 +167,10 @@ sub isinlinableimage ($) {
        $file=~/\.(png|gif|jpg|jpeg)$/;
 }
 
        $file=~/\.(png|gif|jpg|jpeg)$/;
 }
 

-sub htmllink ($$) {
+sub htmllink {

        my $page=shift;
        my $link=shift;
        my $page=shift;
        my $link=shift;

+       my $noimagelink=shift;

 
        my $bestlink=bestlink($page, $link);
 
 
        my $bestlink=bestlink($page, $link);
 


@@ -188,7 +189,7 @@ sub htmllink ($$) {
        
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        
        
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        

-       if (isinlinableimage($bestlink)) {
+       if (! $noimagelink && isinlinableimage($bestlink)) {

                return "<img src=\"$bestlink\">";
        }
        return "<a href=\"$bestlink\">$link</a>";
                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\/(.+)$/) {
                                $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';
                        }
                        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,
                        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';
                                return @ret if @ret >= $num;
                                
                                $state='header';


@@ -644,10 +645,10 @@ sub cgi () {
                my $list="<ul>\n";
                foreach my $change (rcs_recentchanges(100)) {
                        $list.="<li>";
                my $list="<ul>\n";
                foreach my $change (rcs_recentchanges(100)) {
                        $list.="<li>";

-                       $list.=join(", ", map { htmllink("index", $_) } @{$change->{pages}});
+                       $list.=join(", ", map { htmllink("index", $_, 1) } @{$change->{pages}});

                        $list.="<br>\n";
                        $list.="changed ".$change->{when}." by ".
                        $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";
                }
                               ": <i>".$change->{message}."</i>\n";
                        $list.="</li>\n";
                }