a few bugfixes

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 02c99e9f67db1e62327d7a8108f6c570f5e17fb5..4e0e9e8c72162d93e99cf874da29672ff1b11ab6 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -84,14 +84,8 @@ sub preprocess (@) { #{{{
                $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
                # fallthrough
        }
-       elsif ($key eq 'uuid') {
-               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);
+       elsif ($key eq 'guid') {
+               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
                # fallthrough
        }
        elsif ($key eq 'license') {
@@ -144,7 +138,7 @@ sub preprocess (@) { #{{{
                # editable page as a stylesheet
                my $stylesheet=bestlink($page, $value.".css");
                if (! length $stylesheet) {
-                       return "[[meta ".gettext("stylesheet not found")."]]";
+                       error gettext("stylesheet not found")
                }
                push @{$metaheaders{$page}}, '<link href="'.urlto($stylesheet, $page).
                        '" rel="'.encode_entities($rel).
@@ -178,7 +172,7 @@ sub preprocess (@) { #{{{
                        add_depends($page, $redir_page);
                        my $link=bestlink($page, $redir_page);
                        if (! length $link) {
-                               return "[[meta ".gettext("redir page not found")."]]";
+                               error gettext("redir page not found")
                        }
 
                        $value=urlto($link, $page);
@@ -191,7 +185,7 @@ sub preprocess (@) { #{{{
                        my %seen;
                        while (exists $pagestate{$at}{meta}{redir}) {
                                if ($seen{$at}) {
-                                       return "[[meta ".gettext("redir cycle is not allowed")."]]";
+                                       error gettext("redir cycle is not allowed")
                                }
                                $seen{$at}=1;
                                $at=$pagestate{$at}{meta}{redir};
@@ -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) {