Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index eebe3460f07a42ab2841aadcb08190fe02ae566f..cd6fa20bab87e3d74a0480e4eefaee08bbd74e2b 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -187,7 +187,7 @@ sub preprocess (@) {
                        error gettext("script not found");
                }
                push @{$metaheaders{$page}}, scrub('<script src="'.urlto($js, $page).
-                       '"' . $defer . $async . ' type="text/javascript" />',
+                       '"' . $defer . $async . ' type="text/javascript"></script>',
                        $page, $destpage);
        }
        elsif ($key eq 'openid') {
@@ -300,7 +300,8 @@ sub pagetemplate (@) {
                $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
        }
        if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
-               $template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
+               eval q{use HTML::Entities};
+               $template->param(title => encode_numeric($pagestate{$page}{meta}{title}));
                $template->param(title_overridden => 1);
        }
 
@@ -315,7 +316,8 @@ sub pagetemplate (@) {
        }
 
        foreach my $field (qw{description}) {
-               $template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
+               eval q{use HTML::Entities};
+               $template->param($field => encode_numeric($pagestate{$page}{meta}{$field}))
                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
        }