touchups

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 57c43cfdf4db1b033d19541b77d1893889e227fd..396bff2e4cebbdd2bf3a96845008590a466659c6 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -47,7 +47,7 @@ sub confirmation_form ($$) { #{{{
        $f->field(name => "page", label => "Will remove:", size => 60,
                validate => sub {
                # Validate page by checking that the page exists, and that
-               # the user is allowed to edit(/delete) it.
+               # the user is allowed to edit(/remove) it.
                my $page=IkiWiki::titlepage(shift);
                if (! exists $pagesources{$page}) {
                        $f->field(name => "page", message => gettext("page does not exist"));
@@ -97,13 +97,13 @@ sub sessioncgi ($$) { #{{{
                my $session=shift;
                my ($form, $buttons)=confirmation_form($q, $session);
                IkiWiki::decode_form_utf8($form);
+
                if ($form->submitted eq 'Cancel') {
                        # Load saved form state and return to edit form.
                        my $postremove=CGI->new($session->param("postremove"));
                        $session->clear("postremove");
                        IkiWiki::cgi_savesession($session);
                        IkiWiki::cgi($postremove, $session);
-                       exit 0;
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {
                        my $page=IkiWiki::titlepage($form->field("page"));
@@ -123,11 +123,19 @@ sub sessioncgi ($$) { #{{{
                        IkiWiki::prune("$config{srcdir}/$file");
                        IkiWiki::refresh();
                        IkiWiki::saveindex();
+
+                       # Redirect to parent of the page.
+                       my $parent=IkiWiki::dirname($page);
+                       if (! exists $pagesources{$parent}) {
+                               $parent="index";
+                       }
+                       IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
                }
                else {
                        IkiWiki::showform($form, $buttons, $session, $q);
-                       exit 0;
                }
+
+               exit 0;
        }
 }