Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index d0e4176ffb862c6c8dc554bc5047124f82661c41..a73ff37b98f9f8ced928df004c96013017b676f2 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -115,8 +115,6 @@ sub store ($$$) { #{{{
        my $change=shift;
 
        my $page="$config{recentchangespage}/change_".titlepage($change->{rev});
        my $change=shift;
 
        my $page="$config{recentchangespage}/change_".titlepage($change->{rev});

-       my $baseurl = IkiWiki::baseurl();
-       my $permalink="$baseurl$config{recentchangespage}/#change-".titlepage($change->{rev});

 
        # Optimisation to avoid re-writing pages. Assumes commits never
        # change (or that any changes are not important).
 
        # Optimisation to avoid re-writing pages. Assumes commits never
        # change (or that any changes are not important).


@@ -175,10 +173,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},

-               permalink => $permalink,

        );
        );

+       
+       $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});