Merge branch 'aggregateinternal'

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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index cd5dc83acc6b1da5b990f18105070f1fba132487..9591fbe04b3d7a9ef5a0718fc3bc8ff36b1741a3 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -22,7 +22,7 @@ sub sanitize (@) { #{{{
        my $pid;
        my $sigpipe=0;
        $SIG{PIPE}=sub { $sigpipe=1 };
        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');

        
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');
        
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');


@@ -36,8 +36,8 @@ sub sanitize (@) { #{{{
        close IN;
        waitpid $pid, 0;
 
        close IN;
        waitpid $pid, 0;
 

-       return $params{content} if $sigpipe;

        $SIG{PIPE}="DEFAULT";
        $SIG{PIPE}="DEFAULT";

+       return $params{content} if $sigpipe;

 
        return $ret;
 } # }}}
 
        return $ret;
 } # }}}