From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Aug 2008 03:14:59 +0000 (-0400)
Subject: pull values from form to config
X-Git-Tag: 2.60~114
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c02d670d010bbaa320b71435febc8d74e951749;p=ikiwiki.git

pull values from form to config
---

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 64c4d0991..24ccee40f 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -261,7 +261,16 @@ sub showform ($$) { #{{{
 		foreach my $field (keys %fields) {
 			# TODO plugin enable/disable
 			next if $field=~/^enable\./; # plugin
-			$config{$fields{$field}}=$form->field($field);
+
+			my $key=$fields{$field};
+			my $value=$form->field($field);
+
+			next unless defined $value;
+			# Avoid setting fields to empty strings,
+			# if they were not set before.
+			next if ! defined $config{$key} && ! length $value;
+
+			$config{$key}=$value;
 		}
 		# TODO save to real path
 		IkiWiki::Setup::dump("/tmp/s");