aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-11-27 13:19:19 -0400
committerJoey Hess <joey@kitenet.net>2011-11-27 13:19:19 -0400
commit41f6363a633cffd002f3af9f8b216f56f8924ecc (patch)
tree9ab3359a59a540f0dd8edc97b4e756f6a5baa0e2
parent42e15638dcd10029168214845919e6eab5dcf283 (diff)
downloadikiwiki-41f6363a633cffd002f3af9f8b216f56f8924ecc.tar
ikiwiki-41f6363a633cffd002f3af9f8b216f56f8924ecc.tar.gz
editpage: Fix FormattingHelp link on Discussion pages.
In 875d550f1278215e6c87d3b78ff87db24c6d76b3 I for some reason made $page be changed when creating a discussion page, which broke the link on the edit page. Changing page seems unnecessary, so reverted that part of the change.
-rw-r--r--IkiWiki/Plugin/editpage.pm2
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn2
3 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a5c29a352..54051c58c 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -231,7 +231,7 @@ sub cgi_editpage ($$) {
if ! $form->submitted && lc($page) ne $page;
}
elsif (lc $page eq lc $config{discussionpage}) {
- @page_locs=$best_loc=$page="$from/".lc($page);
+ @page_locs=$best_loc="$from/".lc($page);
}
else {
my $dir=$from."/";
diff --git a/debian/changelog b/debian/changelog
index 7f6564d7f..52d9ddf3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low
* img: Bugfix to width/height tags for scaled down image when only
one dimension was provided. Thanks, Per Carlson.
+ * editpage: Fix FormattingHelp link on Discussion pages.
-- Joey Hess <joeyh@debian.org> Thu, 17 Nov 2011 18:52:23 -0400
diff --git a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
index 0eadc5809..8f87329ae 100644
--- a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
+++ b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
@@ -1 +1,3 @@
For an example of what I mean, go to [[TourBusStop]]. Click the Discussion link. Click the <code>FormattingHelp</code> link. You'll be sent to [TourBusStop/ikiwiki/formatting](/TourBusStop/ikiwiki/formatting/) which of course doesn't exist.
+
+> A bug introduced in the last release. [[fixed|done]] --[[Joey]]