Merge remote-tracking branch 'smcv/ready/transient-rm'

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a385ed8395272446f62bbba41c5fb5876c0dbca0..d3c6959354eeebf550d199870cbe7a1c5d1a818c 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -39,7 +39,7 @@ sub refresh () {
                                }
                                if ($delete) {
                                        debug(sprintf(gettext("removing old preview %s"), $file));
-                                       IkiWiki::prune("$config{destdir}/$file");
+                                       IkiWiki::prune("$config{destdir}/$file", $config{destdir});
                                }
                        }
                        elsif (defined $mtime) {
@@ -230,13 +230,15 @@ sub cgi_editpage ($$) {
                                unshift @page_locs, lc($page)
                                        if ! $form->submitted && lc($page) ne $page;
                        }
+                       elsif (lc $page eq lc $config{discussionpage}) {
+                               @page_locs=$best_loc="$from/".lc($page);
+                       }
                        else {
                                my $dir=$from."/";
                                $dir=~s![^/]+/+$!!;
                                
                                if ((defined $form->field('subpage') &&
-                                    length $form->field('subpage')) ||
-                                   $page eq lc($config{discussionpage})) {
+                                    length $form->field('subpage'))) {
                                        $best_loc="$from/$page";
                                }
                                else {