Merge remote-tracking branch 'origin/master'

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

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index acbe40a5d6ea9f3e071c9e9199c677e1cbdbf6b7..da450eea7ef691c8f16ed4e5a20a2603b0491c22 100644 (file)
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -9,8 +9,7 @@ package IkiWiki::Plugin::htmlbalance;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
-use HTML::TreeBuilder;
+use IkiWiki 3.00;
 use HTML::Entities;
 
 sub import {
@@ -30,6 +29,8 @@ sub sanitize (@) {
        my %params=@_;
        my $ret = '';
 
+       eval q{use HTML::TreeBuilder};
+       error $@ if $@;
        my $tree = HTML::TreeBuilder->new();
        $tree->ignore_unknown(0);
        $tree->ignore_ignorable_whitespace(0);
@@ -42,7 +43,7 @@ sub sanitize (@) {
        my @nodes = $tree->disembowel();
        foreach my $node (@nodes) {
                if (ref $node) {
-                       $ret .= $node->as_XML();
+                       $ret .= $node->as_HTML(undef, '', {});
                        chomp $ret;
                        $node->delete();
                }