Correctly handle filenames starting with a dash in add/rm/mv.

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

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 0a3d90aec0d9654269fd70c63f6e9825f219c6a8..d3cbff0d554cf11f9d6c9b3e9249293e60845ab4 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -151,7 +151,10 @@ sub showfields ($$$@) {
                my %info=%{shift @show};
 
                my $description=$info{description};
-               if (exists $info{link} && length $info{link}) {
+               if (exists $info{htmldescription}) {
+                       $description=$info{htmldescription};
+               }
+               elsif (exists $info{link} && length $info{link}) {
                        if ($info{link} =~ /^\w+:\/\//) {
                                $description="<a href=\"$info{link}\">$description</a>";
                        }
@@ -457,12 +460,12 @@ sub showform ($$) {
 
                        my @command;
                        if ($form->submitted eq 'Rebuild Wiki') {
-                               @command=("ikiwiki", "-setup", $config{setupfile},
-                                        "-rebuild", "-v");
+                               @command=("ikiwiki", "--setup", $config{setupfile},
+                                        "--rebuild", "-v");
                        }
                        else {
-                               @command=("ikiwiki", "-setup", $config{setupfile},
-                                       "-refresh", "-wrappers", "-v");
+                               @command=("ikiwiki", "--setup", $config{setupfile},
+                                       "--refresh", "--wrappers", "-v");
                        }
 
                        close STDERR;