Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index bc793bada98ab9867ebf59fd8f2a153c61741d71..e3ba9b8d8248858689619fee48a963912c593648 100644 (file)
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -3,27 +3,27 @@ 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;
 
 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 => "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} &&
        my %params=@_;
        my $template=$params{template};
        if ($config{rcs} && exists $params{rev} && length $params{rev} &&


@@ -39,11 +39,13 @@ sub pagetemplate (@) { #{{{
                        else {
                                $diff=join("", @lines);
                        }
                        else {
                                $diff=join("", @lines);
                        }

+                       # escape html
+                       $diff = encode_entities($diff);

                        # escape links and preprocessor stuff
                        $diff = encode_entities($diff, '\[\]');
                        $template->param(diff => $diff);
                }
        }
                        # escape links and preprocessor stuff
                        $diff = encode_entities($diff, '\[\]');
                        $template->param(diff => $diff);
                }
        }

-} #}}}
+}

 
 1
 
 1