X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/43c647edd31c224e0ca07785ef1ac7e856639c09..84c905ec2011ec846d3d8b27f21f5ffd53c73840:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 8e1b11859..4e0e9e8c7 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -84,6 +84,10 @@ sub preprocess (@) { #{{{
 		$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" />';
 		$pagestate{$page}{meta}{license}=$value;
@@ -134,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).
@@ -168,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);
@@ -181,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};
@@ -253,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) {