aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-11-06 16:14:04 -0400
committerJoey Hess <joey@kitenet.net>2011-11-06 16:14:04 -0400
commit875d550f1278215e6c87d3b78ff87db24c6d76b3 (patch)
tree7f0f12fb04373e8b5d2fcbf346a4279511b1510d /IkiWiki/Plugin
parent67b2beb1b00ea5c82446533edab07cc6e9e18876 (diff)
downloadikiwiki-875d550f1278215e6c87d3b78ff87db24c6d76b3.tar
ikiwiki-875d550f1278215e6c87d3b78ff87db24c6d76b3.tar.gz
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.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/editpage.pm6
1 files changed, 4 insertions, 2 deletions
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 {