Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index d48b28f955043ec347dd87879a789c0830dfa5ab..6875844a32fc61a67a7d6eae82c4ed684e2681df 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 }
 
 sub allowed_dirs {
 }
 
 sub allowed_dirs {

+       no warnings 'once';

        return grep { defined $_ } (
                $config{srcdir},
                $IkiWiki::Plugin::transient::transientdir,
        return grep { defined $_ } (
                $config{srcdir},
                $IkiWiki::Plugin::transient::transientdir,


@@ -219,7 +220,7 @@ sub sessioncgi ($$) {
                        postremove($session);
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {
                        postremove($session);
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {

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

 
                        my @pages=$form->field("page");
                        
 
                        my @pages=$form->field("page");