Merge commit 'smcv/master'

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 02c99e9f67db1e62327d7a8108f6c570f5e17fb5..55c214f67830e889fd51e8890fc97091a11d3f8b 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -84,14 +84,14 @@ sub preprocess (@) { #{{{
                $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
                # fallthrough
        }
-       elsif ($key eq 'uuid') {
+       elsif ($key eq 'guid') {
                my $abs = $value;
 
                if ($abs =~ m/^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit]]{4}-[[:xdigit:]]{4}-[[:xdigit:]]{12}$/) {
                        $abs = lc "urn:uuid:$abs";
                }
 
-               $pagestate{$page}{meta}{uuid}=HTML::Entities::encode_numeric($abs);
+               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($abs);
                # fallthrough
        }
        elsif ($key eq 'license') {
@@ -270,7 +270,7 @@ sub match { #{{{
                $val=$pagestate{$page}{meta}{$field};
        }
        elsif ($field eq 'title') {
-               $val=pagetitle($page);
+               $val = IkiWiki::pagetitle($page);
        }
 
        if (defined $val) {