From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 17 Nov 2008 19:19:15 +0000 (-0500)
Subject: use perl modules up front
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8a945845bd0774c2280da53f8a976c48547ede4;p=ikiwiki.git

use perl modules up front

The old code actually did the same thing, just obfuscated -- since the eval
use wasn't quoted, it used the modules on load. Thus, the error (not to
mentioned the return) was bypassed, and it just failed on load.

But that seems like the right thing to do, really, so just made it clearer
that's what happens.
---

diff --git a/IkiWiki/Plugin/htmlbalance.pm b/IkiWiki/Plugin/htmlbalance.pm
index 667d73b6c..8f43d5dac 100644
--- 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 HTML::TreeBuilder;
+use XML::Atom::Util qw(encode_xml);
 
 sub import { #{{{
 	hook(type => "getsetup", id => "htmlbalance", call => \&getsetup);
@@ -28,16 +30,6 @@ sub sanitize (@) { #{{{
 	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) {