From: Joey Hess <joey@kitenet.net>
Date: Sun, 6 Nov 2011 20:14:04 +0000 (-0400)
Subject: Fix handling of discussion page creation links to make discussion pages in the right... 
X-Git-Tag: 3.20111106~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/875d550f1278215e6c87d3b78ff87db24c6d76b3

Fix handling of discussion page creation links to make discussion pages in the right place and with the right case.

Broken by page case preservation feature added in 3.20110707.
---

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a385ed839..a5c29a352 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=$page="$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 {
diff --git a/debian/changelog b/debian/changelog
index 647a03f9a..20ff8536b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ikiwiki (3.20110906) UNRELEASED; urgency=low
   * rst: import docutils lazily, to avoid errors during ikiwiki --setup.
     Closes: #637604 (Thanks, smcv)
   * Make the setup automator create YAML formatted files.
+  * Fix handling of discussion page creation links to make discussion pages
+    in the right place and with the right case. Broken by page case
+    preservation feature added in 3.20110707.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Sep 2011 10:47:13 -0400