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.

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a5c29a352788b37c70a6a56614e95152d36f069d..54051c58c2cf836e258c110d0ec4a47d6ff1e0a2 100644 (file)
--- 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}) {
                                        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."/";
                        }
                        else {
                                my $dir=$from."/";

diff --git a/debian/changelog b/debian/changelog
index 7f6564d7ffdb0544c38f2732918c2109665f123d..52d9ddf3e6aed7ae78b873407d911970d3e9f23c 100644 (file)
--- 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.
 
   * 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
 
 
  -- 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 0eadc5809241d3ac33458be7e8edb8294cc8faa5..8f87329ae50c19da2d5021da738c617cf064999d 100644 (file)
--- 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.
 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]]