X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/903213e63fd6c409046f66e73881aba33c3926de..502a3433c410369eca4eb36b8fb8be5bc4a34a2d:/IkiWiki/Plugin/htmltidy.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index d9aaba4ca..9ba5e9592 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -31,11 +31,11 @@ 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'); - + $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; @@ -46,7 +46,7 @@ sub sanitize (@) { #{{{ waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - return $params{content} if $sigpipe; + return "" if $sigpipe || ! defined $ret; return $ret; } # }}}