Merge branch 'bugs'

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index d7f56a8bd112712f38dfa9d8e73801427d772f4c..d00b6854f698126e6b6548fc0705deefc0f6f748 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -85,13 +85,7 @@ sub preprocess (@) { #{{{
                # fallthrough
        }
        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}{guid}=HTML::Entities::encode_numeric($abs);
+               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
                # fallthrough
        }
        elsif ($key eq 'license') {
@@ -270,7 +264,7 @@ sub match { #{{{
                $val=$pagestate{$page}{meta}{$field};
        }
        elsif ($field eq 'title') {
-               $val=pagetitle($page);
+               $val = IkiWiki::pagetitle($page);
        }
 
        if (defined $val) {