web commit by http://smcv.pseudorandom.co.uk/: Patched

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 0c210b64d6b78f2f028d07680a566137833656d4..d00b6854f698126e6b6548fc0705deefc0f6f748 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -53,7 +53,7 @@ sub htmlize ($$$) { #{{{
        my $page = shift;
        my $destpage = shift;
 
-       return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+       return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),
                IkiWiki::linkify($page, $destpage,
                IkiWiki::preprocess($page, $destpage, shift)));
 }
@@ -78,6 +78,15 @@ sub preprocess (@) { #{{{
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {
                $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
+               # fallthrough
+       }
+       elsif ($key eq 'description') {
+               $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
+               # fallthrough
+       }
+       elsif ($key eq 'guid') {
+               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
+               # fallthrough
        }
        elsif ($key eq 'license') {
                push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';
@@ -149,9 +158,9 @@ sub preprocess (@) { #{{{
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
                                '" rel="openid2.local_id" />';
                }
-               if (exists $params{xrds-location} && safeurl($params{xrds-location})) {
+               if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
                        push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
-                               'content="'.encode_entities($params{xrds-location}).'" />';
+                               'content="'.encode_entities($params{"xrds-location"}).'" />';
                }
        }
        elsif ($key eq 'redir') {
@@ -186,7 +195,7 @@ sub preprocess (@) { #{{{
                        $value=encode_entities($value);
                }
                my $delay=int(exists $params{delay} ? $params{delay} : 0);
-               my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\">";
+               my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
                if (! $safe) {
                        $redir=scrub($redir);
                }
@@ -203,7 +212,7 @@ sub preprocess (@) { #{{{
        }
        elsif ($key eq 'robots') {
                push @{$metaheaders{$page}}, '<meta name="robots"'.
-                       ' value="'.encode_entities($value).'" />';
+                       ' content="'.encode_entities($value).'" />';
        }
        else {
                push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
@@ -248,16 +257,14 @@ sub match { #{{{
        my $page=shift;
        
        # turn glob into a safe regexp
-       my $re=quotemeta(shift);
-       $re=~s/\\\*/.*/g;
-       $re=~s/\\\?/./g;
+       my $re=IkiWiki::glob2re(shift);
 
        my $val;
        if (exists $pagestate{$page}{meta}{$field}) {
                $val=$pagestate{$page}{meta}{$field};
        }
        elsif ($field eq 'title') {
-               $val=pagetitle($page);
+               $val = IkiWiki::pagetitle($page);
        }
 
        if (defined $val) {