From: Joey Hess <joey@kitenet.net>
Date: Fri, 12 Nov 2010 05:54:29 +0000 (-0400)
Subject: websetup: Fix saving of advanced mode changes.
X-Git-Tag: 3.20100815.2~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c87dab2c667d827bf8f8462e4427b79eff7919fb

websetup: Fix saving of advanced mode changes.

The showadvanced field was not known to formbuilder when hitting the save
changes button.
(cherry picked from commit 274219ecc865f9bdcb65ad26e4750fa90dfaa670)

Conflicts:

	debian/changelog
---

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 11b4428e3..2674b91e8 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -295,6 +295,7 @@ sub showform ($$) {
 	$form->field(name => "do", type => "hidden", value => "setup",
 		force => 1);
 	$form->field(name => "rebuild_asked", type => "hidden");
+	$form->field(name => "showadvanced", type => "hidden");
 
 	if ($form->submitted eq 'Basic Mode') {
 		$form->field(name => "showadvanced", type => "hidden", 
diff --git a/debian/changelog b/debian/changelog
index 425b4a1bb..4f0eda9d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20100815.2) UNRELEASED; urgency=low
   * external: Disable RPC::XML's "smart" encoding, which sent ints
     for strings that contained only a number, fixing a longstanding crash
     of the rst plugin.
+  * websetup: Fix saving of advanced mode changes.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400