Merge commit 'origin/master'

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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 19271b1366a71d848b69f36b2edc27e23c87b7da..9ba5e9592b0c84482e01175c5881f901315a4397 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -13,20 +13,29 @@ use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "tidy", call => \&getsetup);
        hook(type => "sanitize", id => "tidy", call => \&sanitize);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 sub sanitize (@) { #{{{
        my %params=@_;
 
        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');
-       
+       $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes 2>/dev/null');
+
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');
-       binmode (OUT, ':utf8'); 
+       binmode (OUT, ':utf8');
        
        print OUT $params{content};
        close OUT;
@@ -37,7 +46,7 @@ sub sanitize (@) { #{{{
        waitpid $pid, 0;
 
        $SIG{PIPE}="DEFAULT";
-       return $params{content} if $sigpipe;
+       return "" if $sigpipe || ! defined $ret;
 
        return $ret;
 } # }}}