X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/25b01f94045eaa262587fcd18e8525eed9c18157..efbb1121ffdc146f5c9a481a51f23ad151b9f240:/IkiWiki/Plugin/editpage.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a385ed839..54051c58c 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -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 {