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 11b4428e3fc0a55f6637516c56b2dca8a7460163..2674b91e812a3eb8b98edcdb12026d067f34b112 100644 (file)
--- 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 425b4a1bb41033adad1e242347d47874292e6f1b..4f0eda9d70559c0c222c71c47dea33fcb258e2e6 100644 (file)
--- 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