inline: Handle obfuscated urls, such as the mailto urls generated by markdown when...

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index eebe3460f07a42ab2841aadcb08190fe02ae566f..e9736584c5836fb9c4a077819ca6b939fd248aa9 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') {
@@ -217,6 +217,13 @@ sub preprocess (@) {
                                'content="'.encode_entities($url).'" />';
                }
        }
+       elsif ($key eq 'foaf') {
+               if (safeurl($value)) {
+                       push @{$metaheaders{$page}}, '<link rel="meta" '.
+                               'type="application/rdf+xml" title="FOAF" '.
+                               'href="'.encode_entities($value).'" />';
+               }
+       }
        elsif ($key eq 'redir') {
                return "" if $page ne $destpage;
                my $safe=0;
@@ -300,6 +307,7 @@ sub pagetemplate (@) {
                $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
        }
        if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
+               eval q{use HTML::Entities};
                $template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
                $template->param(title_overridden => 1);
        }
@@ -315,6 +323,7 @@ sub pagetemplate (@) {
        }
 
        foreach my $field (qw{description}) {
+               eval q{use HTML::Entities};
                $template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
        }