X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0daa4eb521a32b9ed00e99a2155416a312d478de..5acec79c64de145feb364742dde7d9391992b0a8:/IkiWiki/Plugin/websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 2d978c5b4..9edd22d26 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -138,9 +138,8 @@ sub showfields ($$$@) {
 
 		my $value=$config{$key};
 
-		if ($info{safe} && defined $value &&
-		    (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-			$value=[@{$value}, "", ""]; # blank items for expansion
+		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
+			$value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion
 		}
 
 		if ($info{type} eq "string") {
@@ -404,6 +403,7 @@ sub showform ($$) {
 			$form->reset(0); # doesn't really make sense here
 		}
 		else {
+			my $oldsetup=readfile($config{setupfile});
 			IkiWiki::Setup::dump($config{setupfile});
 
 			IkiWiki::saveindex();
@@ -427,16 +427,21 @@ sub showform ($$) {
 					"-refresh", "-wrappers", "-v");
 			}
 
+			close STDERR;
+			open(STDERR, ">&STDOUT");
 			my $ret=system(@command);
-			print "\n<pre>";
+			print "\n<\/pre>";
 			if ($ret != 0) {
 				print '<p class="error">'.
-					sprintf(gettext("<p class=\"error\">Error: %s exited nonzero (%s)"),
+					sprintf(gettext("Error: %s exited nonzero (%s). Discarding setup changes."),
 						join(" ", @command), $ret).
 					'</p>';
+				open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
+				print OUT $oldsetup;
+				close OUT;
 			}
 
-			print $tail;			
+			print $tail;
 			exit 0;
 		}
 	}