Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[ikiwiki.git] / IkiWiki / Plugin / websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index a47c2997611a492b6c6f0050dd91750c15a3a4c9..75aa3681c2e68744f850b39f806cbbd329d55d97 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -139,7 +139,11 @@ sub showfields ($$$@) {
                my $value=$config{$key};
 
                if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-                       $value=[@{$value}, "", ""]; # blank items for expansion
+                       $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : ""),
+                               "", ""]; # blank items for expansion
+               }
+               else {
+                       $value=Encode::encode_utf8($value);
                }
 
                if ($info{type} eq "string") {
@@ -290,7 +294,6 @@ sub showform ($$) {
                shift->(form => $form, cgi => $cgi, session => $session,
                        buttons => $buttons);
        });
-       IkiWiki::decode_form_utf8($form);
 
        my %fields=showfields($form, undef, undef, IkiWiki::getsetup());
        
@@ -308,6 +311,8 @@ sub showform ($$) {
                        $fields{$_}=$shown{$_} foreach keys %shown;
                }
        }
+
+       IkiWiki::decode_form_utf8($form);
        
        if ($form->submitted eq "Cancel") {
                IkiWiki::redirect($cgi, $config{url});
@@ -403,6 +408,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();
@@ -426,16 +432,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;
                }
        }