From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 30 Jun 2007 00:48:39 +0000 (+0000)
Subject: * Correct a longstanding bug that could cause the edit form to be empty.
X-Git-Tag: 2.3~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b1560f7275464f2fc1a38fac76855ce065964f28

* Correct a longstanding bug that could cause the edit form to be empty.
  This turns out to have occured if the cgi wrapper was created by an
  ikiwiki invocation that included --rebuild. Thanks to Carl Worth for
  tracking that down.
---

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index c279e6451..87db648e0 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -34,7 +34,7 @@ sub setup_standard {
 		delete $setup{wrappers};
 		my %startconfig=(%config);
 		foreach my $wrapper (@wrappers) {
-			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+			%config=(%startconfig, rebuild => 0, verbose => 0, %setup, %{$wrapper});
 			checkconfig();
 			if (! $config{cgi} && ! $config{post_commit}) {
 				$config{post_commit}=1;
diff --git a/debian/changelog b/debian/changelog
index 689ec8c4b..4c661a656 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.3) UNRELEASED; urgency=low
+ikiwiki (2.3) unstable; urgency=low
 
   * Corrected a typo in an error handler in the image plugin.
   * Allow svnpath config option to contain additional extra slashes anywhere
@@ -8,8 +8,12 @@ ikiwiki (2.3) UNRELEASED; urgency=low
   * Patch fixing various additional problems with test suite. Closes: #425891
     once more.
   * French update from Jean-Luc Coulon. Closes: #430771
+  * Correct a longstanding bug that could cause the edit form to be empty.
+    This turns out to have occured if the cgi wrapper was created by an
+    ikiwiki invocation that included --rebuild. Thanks to Carl Worth for
+    tracking that down.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 28 Jun 2007 13:46:56 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 29 Jun 2007 18:30:38 -0400
 
 ikiwiki (2.2) unstable; urgency=low