* 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 c279e6451e738505e0ceb5b3e47e96087312c5b9..87db648e0accc2c177f2f55e8c6dc712863a0326 100644 (file)
--- 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 689ec8c4b2e2afa5d145adacb21e44b1d7bb7692..4c661a656532dcc467d2e69036e30c8acf173050 100644 (file)
--- 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