typo

[git.ikiwiki.info.git] / IkiWiki / Plugin / recentchangesdiff.pm

diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index 36acef72ebccf8978c3c4e8348074ef4bca0565c..41882279331f8b1a2171bb98197602197ba64190 100644 (file)
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -3,46 +3,56 @@ package IkiWiki::Plugin::recentchangesdiff;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;
+use HTML::Entities;

 
 my $maxlines=200;
 
 
 my $maxlines=200;
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "recentchangesdiff",
                call => \&getsetup);
        hook(type => "pagetemplate", id => "recentchangesdiff",
                call => \&pagetemplate);
        hook(type => "getsetup", id => "recentchangesdiff",
                call => \&getsetup);
        hook(type => "pagetemplate", id => "recentchangesdiff",
                call => \&pagetemplate);

-} #}}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return 
                plugin => {
                        safe => 1,
                        rebuild => 1,
                },
        return 
                plugin => {
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+}

 
 

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
        my $template=$params{template};
        if ($config{rcs} && exists $params{rev} && length $params{rev} &&
            $template->query(name => "diff")) {
        my %params=@_;
        my $template=$params{template};
        if ($config{rcs} && exists $params{rev} && length $params{rev} &&
            $template->query(name => "diff")) {

-               my @lines=IkiWiki::rcs_diff($params{rev});
+               my @lines=IkiWiki::rcs_diff($params{rev}, $maxlines+1);

                if (@lines) {
                        my $diff;
                if (@lines) {
                        my $diff;

+                       my $trunc=0;

                        if (@lines > $maxlines) {
                        if (@lines > $maxlines) {

-                               # only include so many lines of diff
-                               $diff=join("", @lines[0..($maxlines-1)])."\n".
-                                       gettext("(Diff truncated)");
+                               $diff=join("", @lines[0..($maxlines-1)]);
+                               $trunc=1;

                        }
                        else {
                                $diff=join("", @lines);
                        }
                        }
                        else {
                                $diff=join("", @lines);
                        }

+                       if (length $diff > 102400) {
+                               $diff=substr($diff, 0, 10240);
+                               $trunc=1;
+                       }
+                       if ($trunc) {
+                               $diff.="\n".gettext("(Diff truncated)");
+                       }
+                       # escape html
+                       $diff = encode_entities($diff);

                        # escape links and preprocessor stuff
                        # escape links and preprocessor stuff

-                       $diff =~ s/(?<!\\)\[\[/\\\[\[/g;
+                       $diff = encode_entities($diff, '\[\]');

                        $template->param(diff => $diff);
                }
        }
                        $template->param(diff => $diff);
                }
        }

-} #}}}
+}

 
 1
 
 1