Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index bd2826f76518fc2c1a7060d21110331ce744ac2d..08cec3f5a2f0a526482cca2e5d3e5c04b72d75ee 100644 (file)
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -4,21 +4,45 @@ package IkiWiki::Plugin::recentchangesdiff;
 use warnings;
 use strict;
 use IkiWiki 2.00;
 use warnings;
 use strict;
 use IkiWiki 2.00;

+use HTML::Entities;
+
+my $maxlines=200;

 
 sub import { #{{{
 
 sub import { #{{{

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

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

+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+

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

-               my $diff=IkiWiki::rcs_diff($params{rev});
-               if (defined $diff && length $diff) {
+               my @lines=IkiWiki::rcs_diff($params{rev});
+               if (@lines) {
+                       my $diff;
+                       if (@lines > $maxlines) {
+                               # only include so many lines of diff
+                               $diff=join("", @lines[0..($maxlines-1)])."\n".
+                                       gettext("(Diff truncated)");
+                       }
+                       else {
+                               $diff=join("", @lines);
+                       }
+                       # 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);
                }
        }