Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 667d73b6c5e90af016b7ed65cdc76a0de309a9c9..3a2d62d15d47feb20886b594a51d3bc231e62a1b 100644 (file)
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -10,6 +10,8 @@ package IkiWiki::Plugin::htmlbalance;
 use warnings;
 use strict;
 use IkiWiki 2.00;
 use warnings;
 use strict;
 use IkiWiki 2.00;

+use HTML::TreeBuilder;
+use HTML::Entities;

 
 sub import { #{{{
        hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);
 
 sub import { #{{{
        hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);


@@ -28,16 +30,6 @@ sub sanitize (@) { #{{{
        my %params=@_;
        my $ret = '';
 
        my %params=@_;
        my $ret = '';
 

-       eval {
-               use HTML::TreeBuilder;
-               use XML::Atom::Util qw(encode_xml);
-       };
-
-       if ($@) {
-               error($@);
-               return $params{content};
-       }
-

        my $tree = HTML::TreeBuilder->new_from_content($params{content});
        my @nodes = $tree->disembowel();
        foreach my $node (@nodes) {
        my $tree = HTML::TreeBuilder->new_from_content($params{content});
        my @nodes = $tree->disembowel();
        foreach my $node (@nodes) {


@@ -47,7 +39,7 @@ sub sanitize (@) { #{{{
                        $node->delete();
                }
                else {
                        $node->delete();
                }
                else {

-                       $ret .= encode_xml($node);
+                       $ret .= encode_entities($node);

                }
        }
        $tree->delete();
                }
        }
        $tree->delete();