fix a bug

[git.ikiwiki.info.git] / IkiWiki / Rcs / git.pm

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index a156f0b4e9d0e2796bc3602746c3acc194187e73..09275fe5f550868fac8c692665b63ce299bf2073 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -48,7 +48,7 @@ sub _safe_git (&@) { #{{{
        return wantarray ? @lines : ($? == 0);
 }
 # Convenient wrappers.
-sub run_or_die ($@) { _safe_git(\&IkiWiki::error, @_) }
+sub run_or_die ($@) { _safe_git(\&error, @_) }
 sub run_or_cry ($@) { _safe_git(sub { warn @_ },  @_) }
 sub run_or_non ($@) { _safe_git(undef,            @_) }
 #}}}
@@ -343,7 +343,6 @@ sub rcs_recentchanges ($) { #{{{
 
        my ($num) = @_;
 
-       eval q{use CGI 'escapeHTML'};
        eval q{use Date::Parse};
 
        my ($sha1, $type, $when, $diffurl, $user, @pages, @message, @rets);
@@ -357,22 +356,22 @@ sub rcs_recentchanges ($) { #{{{
                $type = "web";
                $when = time - $ci->{'author_epoch'};
 
-               foreach my $bit (@{ $ci->{'details'} }) {
+               DETAIL: foreach my $detail (@{ $ci->{'details'} }) {
                        my $diffurl = $config{'diffurl'};
-                       my $file    = $bit->{'file'};
+                       my $file    = $detail->{'file'};
 
                        $diffurl =~ s/\[\[file\]\]/$file/go;
                        $diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
-                       $diffurl =~ s/\[\[sha1_from\]\]/$bit->{'sha1_from'}/go;
-                       $diffurl =~ s/\[\[sha1_to\]\]/$bit->{'sha1_to'}/go;
+                       $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
+                       $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
 
                        push @pages, {
                                page => pagename($file),
                                diffurl => $diffurl,
-                       },
+                       };
                }
 
-               push @message, { line => escapeHTML($title) };
+               push @message, { line => $title };
 
                if (defined $message[0] &&
                    $message[0]->{line} =~ m/$web_commit_msg/) {