Merge branch 'bugfix'

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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 6f3379ef457bddb7387c8485427ec88d51f5b0c5..1108aeb894e658a35eff011975c1c0b50d14a439 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -15,6 +15,7 @@ use IPC::Open2;
 sub import {
        hook(type => "getsetup", id => "tidy", call => \&getsetup);
        hook(type => "sanitize", id => "tidy", call => \&sanitize);
+       hook(type => "checkconfig", id => "tidy", call => \&checkconfig);
 }
 
 sub getsetup () {
@@ -23,6 +24,18 @@ sub getsetup () {
                        safe => 1,
                        rebuild => undef,
                },
+               htmltidy => {
+                       type => "string",
+                       description => "tidy command line",
+                       safe => 0, # path
+                       rebuild => undef,
+               },
+}
+
+sub checkconfig () {
+       if (! defined $config{htmltidy}) {
+               $config{htmltidy}="tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes";
+       }
 }
 
 sub sanitize (@) {
@@ -31,7 +44,7 @@ sub sanitize (@) {
        my $pid;
        my $sigpipe=0;
        $SIG{PIPE}=sub { $sigpipe=1 };
-       $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes 2>/dev/null');
+       $pid=open2(*IN, *OUT, "$config{htmltidy} 2>/dev/null");
 
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');
@@ -46,7 +59,9 @@ sub sanitize (@) {
        waitpid $pid, 0;
 
        $SIG{PIPE}="DEFAULT";
-       return "" if $sigpipe || ! defined $ret;
+       if ($sigpipe || ! defined $ret) {
+               return gettext("htmltidy failed to parse this html");
+       }
 
        return $ret;
 }