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

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

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 8ce9474be631dbd8ae428304e25d1d1d2adac3df..2b2f43b7ae19fa89a2facf4ba02aca4b66ed671a 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -102,7 +102,7 @@ sub sessioncgi ($$) {
        IkiWiki::decode_form_utf8($form);
 
        if ($form->submitted eq 'Revert' && $form->validate) {
        IkiWiki::decode_form_utf8($form);
 
        if ($form->submitted eq 'Revert' && $form->validate) {

-               IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
+               IkiWiki::checksessionexpiry($q, $session);

                my $message=sprintf(gettext("This reverts commit %s"), $rev);
                if (defined $form->field('revertmessage') &&
                    length $form->field('revertmessage')) {
                my $message=sprintf(gettext("This reverts commit %s"), $rev);
                if (defined $form->field('revertmessage') &&
                    length $form->field('revertmessage')) {


@@ -165,6 +165,7 @@ sub store ($$$) {
        # Limit pages to first 10, and add links to the changed pages.
        my $is_excess = exists $change->{pages}[10];
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
        # Limit pages to first 10, and add links to the changed pages.
        my $is_excess = exists $change->{pages}[10];
        delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;

+       my $has_diffurl=0;

        $change->{pages} = [
                map {
                        if (length $config{cgiurl}) {
        $change->{pages} = [
                map {
                        if (length $config{cgiurl}) {


@@ -180,6 +181,9 @@ sub store ($$$) {
                        else {
                                $_->{link} = pagetitle($_->{page});
                        }
                        else {
                                $_->{link} = pagetitle($_->{page});
                        }

+                       if (defined $_->{diffurl} && length($_->{diffurl})) {
+                               $has_diffurl=1;
+                       }

 
                        $_;
                } @{$change->{pages}}
 
                        $_;
                } @{$change->{pages}}


@@ -227,6 +231,8 @@ sub store ($$$) {
                wikiname => $config{wikiname},
        );
        
                wikiname => $config{wikiname},
        );
        

+       $template->param(has_diffurl => 1) if $has_diffurl;
+

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