inline plugin: if meta plugin is also enabled, and has collected a uuid for a page...

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 8e1b11859fdf4a3bd676d67d8c8a6211adb2c1b1..81355ef6d7a73d657be87eae768e0bfa206a77ba 100644 (file)
--- 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 'uuid') {
+               $pagestate{$page}{meta}{uuid}=HTML::Entities::encode_numeric($value);
+               # fallthrough
+       }
        elsif ($key eq 'license') {
                push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';
                $pagestate{$page}{meta}{license}=$value;
@@ -253,9 +257,7 @@ 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}) {