otl: Avoid globally filtering non-otl pages

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

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 66dacfde34049ee4421da73e8fd6667a4155a81f..9edd22d2625ddf474fc419d84b6bc544ba6c3270 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::websetup;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 sub import {
        hook(type => "getsetup", id => "websetup", call => \&getsetup);
@@ -139,7 +139,7 @@ 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' ? @{$value} : ""), "", ""]; # blank items for expansion
                }
 
                if ($info{type} eq "string") {
@@ -403,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();
@@ -426,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;
                }
        }