load HTML::Entities at top

Used in several subs, not all of which load it on demand, this seems simpler.

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 3ec067cc1c24289dd1c91e5b2f3d32d3b09d0747..942dbbcc3e0ad69d0148382ba163869dce71c58d 100644 (file)
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 2.00;
 use HTML::Parser;
 use HTML::Tagset;
 use IkiWiki 2.00;
 use HTML::Parser;
 use HTML::Tagset;

+use HTML::Entities;

 use URI;
 use open qw{:utf8 :std};
 
 use URI;
 use open qw{:utf8 :std};
 


@@ -205,8 +206,6 @@ sub loadstate () { #{{{
 sub savestate () { #{{{
        return unless $state_loaded;
        garbage_collect();
 sub savestate () { #{{{
        return unless $state_loaded;
        garbage_collect();

-       eval q{use HTML::Entities};
-       error($@) if $@;

        my $newfile="$config{wikistatedir}/aggregate.new";
        my $cleanup = sub { unlink($newfile) };
        open (OUT, ">$newfile") || error("open $newfile: $!", $cleanup);
        my $newfile="$config{wikistatedir}/aggregate.new";
        my $cleanup = sub { unlink($newfile) };
        open (OUT, ">$newfile") || error("open $newfile: $!", $cleanup);


@@ -335,8 +334,6 @@ sub aggregate (@) { #{{{
        error($@) if $@;
        eval q{use URI::Fetch};
        error($@) if $@;
        error($@) if $@;
        eval q{use URI::Fetch};
        error($@) if $@;

-       eval q{use HTML::Entities};
-       error($@) if $@;

 
        foreach my $feed (@_) {
                $feed->{lastupdate}=time;
 
        foreach my $feed (@_) {
                $feed->{lastupdate}=time;