Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index d25c7abff87e515ae3ad109a31845da71b5f924a..4d7023c1c1e5a0af91aad4841eb85c817dfefab3 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -5,6 +5,7 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use Encode;
 use strict;
 use IkiWiki 2.00;
 use Encode;

+use HTML::Entities;

 
 sub import { #{{{
        hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
 
 sub import { #{{{
        hook(type => "getsetup", id => "recentchanges", call => \&getsetup);


@@ -131,7 +132,7 @@ sub store ($$$) { #{{{
                                                do => "recentchanges_link",
                                                page => $_->{page}
                                        ).
                                                do => "recentchanges_link",
                                                page => $_->{page}
                                        ).

-                                       "\">".
+                                       "\" rel=\"nofollow\">".

                                        pagetitle($_->{page}).
                                        "</a>"
                        }
                                        pagetitle($_->{page}).
                                        "</a>"
                        }


@@ -159,11 +160,13 @@ sub store ($$$) { #{{{
                );
        }
 
                );
        }
 

-       # escape wikilinks and preprocessor stuff in commit messages

        if (ref $change->{message}) {
                foreach my $field (@{$change->{message}}) {
                        if (exists $field->{line}) {
        if (ref $change->{message}) {
                foreach my $field (@{$change->{message}}) {
                        if (exists $field->{line}) {

-                               $field->{line} =~ s/(?<!\\)\[\[/\\\[\[/g;
+                               # escape html
+                               $field->{line} = encode_entities($field->{line});
+                               # escape links and preprocessor stuff
+                               $field->{line} = encode_entities($field->{line}, '\[\]');

                        }
                }
        }
                        }
                }
        }


@@ -173,9 +176,12 @@ sub store ($$$) { #{{{
        $template->param(
                %$change,
                commitdate => displaytime($change->{when}, "%X %x"),
        $template->param(
                %$change,
                commitdate => displaytime($change->{when}, "%X %x"),

-               commitdate_raw => scalar localtime($change->{when}),

                wikiname => $config{wikiname},
        );
                wikiname => $config{wikiname},
        );

+       
+       $template->param(permalink => "$config{url}/$config{recentchangespage}/#change-".titlepage($change->{rev}))
+               if exists $config{url};
+       

        IkiWiki::run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,
                        template => $template, rev => $change->{rev});
        IkiWiki::run_hooks(pagetemplate => sub {
                shift->(page => $page, destpage => $page,
                        template => $template, rev => $change->{rev});