Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 2e3614cca7dde3bfcffab25ffefe82591e4eafaa..3f1704846407aa55baad6dd662ba4c263dd25cec 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -73,7 +73,6 @@ sub check_canremove ($$$) {
                        }
                }
        });
-       return $canremove;
 }
 
 sub formbuilder_setup (@) {
@@ -238,7 +237,7 @@ sub sessioncgi ($$) {
                        }
                }
                else {
-                       IkiWiki::showform($form, $buttons, $session, $q);
+                       removal_confirm($q, $session, 0, $q->param("page"));
                }
 
                exit 0;