Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index e23ee491fa6f7f20334ee8acce31af865e56c4cb..f4f9ca348d84a569e866a3cfd33837a24d664a0c 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -28,7 +28,7 @@ sub refresh ($) { #{{{
        
        # delete old and excess changes
        foreach my $page (keys %pagesources) {
        
        # delete old and excess changes
        foreach my $page (keys %pagesources) {

-               if ($page=~/^\Q$config{recentchangespage}\E\/change_/ && ! $seen{$page}) {
+               if ($pagesources{$page} =~ /\._change$/ && ! $seen{$page}) {

                        unlink($config{srcdir}.'/'.$pagesources{$page});
                }
        }
                        unlink($config{srcdir}.'/'.$pagesources{$page});
                }
        }


@@ -39,7 +39,9 @@ sub pagetemplate (@) { #{{{
        my %params=@_;
        my $template=$params{template};
        my $page=$params{page};
        my %params=@_;
        my $template=$params{template};
        my $page=$params{page};

-       if ($config{rcs} && $page ne $config{recentchangespage} &&
+
+       if (defined $config{recentchangespage} && $config{rcs} &&
+           $page ne $config{recentchangespage} &&

            $template->query(name => "recentchangesurl")) {
                $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
                $template->param(have_actions => 1);
            $template->query(name => "recentchangesurl")) {
                $template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
                $template->param(have_actions => 1);


@@ -133,7 +135,7 @@ sub store ($$$) { #{{{
                );
        }
 
                );
        }
 

-       # escape  wikilinks and preprocessor stuff in commit messages
+       # 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}) {


@@ -150,7 +152,8 @@ sub store ($$$) { #{{{
                wikiname => $config{wikiname},
        );
        IkiWiki::run_hooks(pagetemplate => sub {
                wikiname => $config{wikiname},
        );
        IkiWiki::run_hooks(pagetemplate => sub {

-               shift->(page => $page, destpage => $page, template => $template);
+               shift->(page => $page, destpage => $page,
+                       template => $template, rev => $change->{rev});

        });
 
        my $file=$page."._change";
        });
 
        my $file=$page."._change";


@@ -160,10 +163,4 @@ sub store ($$$) { #{{{
        return $page;
 } #}}}
 
        return $page;
 } #}}}
 

-sub updatechanges ($$) { #{{{
-       my $subdir=shift;
-       my @changes=@{shift()};
-       
-} #}}}
-

 1
 1