X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e8a945845bd0774c2280da53f8a976c48547ede4..79a787a4668caf043862197de2b5ba7e41d37102:/IkiWiki/Plugin/htmlbalance.pm

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 8f43d5dac..acbe40a5d 100644
--- a/IkiWiki/Plugin/htmlbalance.pm
+++ b/IkiWiki/Plugin/htmlbalance.pm
@@ -11,26 +11,34 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use HTML::TreeBuilder;
-use XML::Atom::Util qw(encode_xml);
+use HTML::Entities;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);
 	hook(type => "sanitize", id => "htmlbalance", call => \&sanitize);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub sanitize (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 	my $ret = '';
 
-	my $tree = HTML::TreeBuilder->new_from_content($params{content});
+	my $tree = HTML::TreeBuilder->new();
+	$tree->ignore_unknown(0);
+	$tree->ignore_ignorable_whitespace(0);
+	$tree->no_space_compacting(1);
+	$tree->p_strict(1);
+	$tree->store_comments(0);
+	$tree->store_declarations(0);
+	$tree->store_pis(0);
+	$tree->parse_content($params{content});
 	my @nodes = $tree->disembowel();
 	foreach my $node (@nodes) {
 		if (ref $node) {
@@ -39,11 +47,11 @@ sub sanitize (@) { #{{{
 			$node->delete();
 		}
 		else {
-			$ret .= encode_xml($node);
+			$ret .= encode_entities($node);
 		}
 	}
 	$tree->delete();
 	return $ret;
-} # }}}
+}
 
 1