rename, remove: Don't rely on a form parameter to tell whether the page should be...

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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 0609e72c328e5ea4fc06b945203f51f73e0e6338..d9aaba4ca1f4e7c6d3ed631089584071df5a2b3f 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,20 +9,29 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
-use IkiWiki;
+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');
        
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');
@@ -36,8 +45,8 @@ sub sanitize (@) { #{{{
        close IN;
        waitpid $pid, 0;
 
-       return $params{content} if $sigpipe;
        $SIG{PIPE}="DEFAULT";
+       return $params{content} if $sigpipe;
 
        return $ret;
 } # }}}