Merge branch 'master' into po

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 2e3614cca7dde3bfcffab25ffefe82591e4eafaa..cbc8a0f2ce70719e770fc64853feaaa37252f23b 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -58,7 +58,7 @@ sub check_canremove ($$$) {
        my $canremove;
        IkiWiki::run_hooks(canremove => sub {
                return if defined $canremove;
        my $canremove;
        IkiWiki::run_hooks(canremove => sub {
                return if defined $canremove;

-               my $ret=shift->($page, $q, $session);
+               my $ret=shift->(page => $page, cgi => $q, session => $session);

                if (defined $ret) {
                        if ($ret eq "") {
                                $canremove=1;
                if (defined $ret) {
                        if ($ret eq "") {
                                $canremove=1;


@@ -73,7 +73,6 @@ sub check_canremove ($$$) {
                        }
                }
        });
                        }
                }
        });

-       return $canremove;

 }
 
 sub formbuilder_setup (@) {
 }
 
 sub formbuilder_setup (@) {


@@ -238,7 +237,7 @@ sub sessioncgi ($$) {
                        }
                }
                else {
                        }
                }
                else {

-                       IkiWiki::showform($form, $buttons, $session, $q);
+                       removal_confirm($q, $session, 0, $q->param("page"));

                }
 
                exit 0;
                }
 
                exit 0;