releasing version 3.20120419

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index b5f37e913c58e166160f60990e91c1522955c733..8387a1e32446753f749887ba5655d23c2dfce462 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -206,41 +206,45 @@ sub rename_start ($$$$) {
        exit 0;
 }
 
-sub postrename ($$;$$$) {
+sub postrename ($$$;$$) {
        my $cgi=shift;
        my $session=shift;
        my $src=shift;
        my $dest=shift;
        my $attachment=shift;
 
-       # Load saved form state and return to edit page.
-       my $postrename=CGI->new($session->param("postrename"));
-       $session->clear("postrename");
-       IkiWiki::cgi_savesession($session);
+       # Load saved form state and return to edit page, using stored old
+       # cgi state. Or, if the rename was not started on the edit page, 
+       # return to the renamed page.
+       my $postrename=$session->param("postrename");
        if (! defined $postrename) {
-               redirect($cgi, urlto(defined $dest ? $dest : $src));
+               IkiWiki::redirect($cgi, urlto(defined $dest ? $dest : $src));
+               exit;
        }
+       my $oldcgi=CGI->new($postrename);
+       $session->clear("postrename");
+       IkiWiki::cgi_savesession($session);
 
        if (defined $dest) {
                if (! $attachment) {
                        # They renamed the page they were editing. This requires
                        # fixups to the edit form state.
                        # Tweak the edit form to be editing the new page.
-                       $postrename->param("page", $dest);
+                       $oldcgi->param("page", $dest);
                }
 
                # Update edit form content to fix any links present
                # on it.
-               $postrename->param("editcontent",
+               $oldcgi->param("editcontent",
                        renamepage_hook($dest, $src, $dest,
-                                $postrename->param("editcontent")));
+                                $oldcgi->param("editcontent")));
 
                # Get a new edit token; old was likely invalidated.
-               $postrename->param("rcsinfo",
+               $oldcgi->param("rcsinfo",
                        IkiWiki::rcs_prepedit($pagesources{$dest}));
        }
 
-       IkiWiki::cgi_editpage($postrename, $session);
+       IkiWiki::cgi_editpage($oldcgi, $session);
 }
 
 sub formbuilder (@) {