use same logic as for regular discussion links

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index bac16346932d2a00e1bc034d500a1fe8a08abebb..2e5fd7e76959deaa7aed03445284c2b8bb4fb59c 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -8,14 +8,14 @@ use IkiWiki;
 
 my %meta;
 my %title;
 
 my %meta;
 my %title;

+my %permalink;
+my %author;
+my %authorurl;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "meta", 
-               call => \&preprocess);
-       IkiWiki::hook(type => "filter", id => "meta", 
-               call => \&filter);
-       IkiWiki::hook(type => "pagetemplate", id => "meta", 
-               call => \&pagetemplate);
+       hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
+       hook(type => "filter", id => "meta", call => \&filter);
+       hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);

 } # }}}
 
 sub filter (@) { #{{{
 } # }}}
 
 sub filter (@) { #{{{


@@ -51,15 +51,25 @@ sub preprocess (@) { #{{{
                }
                else {
                        # hidden WikiLink
                }
                else {
                        # hidden WikiLink

-                       push @{$IkiWiki::links{$page}}, $value;
+                       push @{$links{$page}}, $value;

                }
        }
        elsif ($key eq 'title') {
                $title{$page}=$value;
        }
                }
        }
        elsif ($key eq 'title') {
                $title{$page}=$value;
        }

+       elsif ($key eq 'permalink') {
+               $permalink{$page}=$value;
+               $meta{$page}.="<link rel=\"bookmark\" href=\"".encode_entities($value)."\" />\n";
+       }

        else {
                $meta{$page}.="<meta name=\"".encode_entities($key).
                        "\" content=\"".encode_entities($value)."\" />\n";
        else {
                $meta{$page}.="<meta name=\"".encode_entities($key).
                        "\" content=\"".encode_entities($value)."\" />\n";

+               if ($key eq 'author') {
+                       $author{$page}=$value;
+               }
+               elsif ($key eq 'authorurl') {
+                       $authorurl{$page}=$value;
+               }

        }
 
        return "";
        }
 
        return "";


@@ -72,8 +82,17 @@ sub pagetemplate (@) { #{{{
 
        $template->param(meta => $meta{$page})
                if exists $meta{$page} && $template->query(name => "meta");
 
        $template->param(meta => $meta{$page})
                if exists $meta{$page} && $template->query(name => "meta");

-       $template->param(title => $title{$page})
-               if exists $title{$page} && $template->query(name => "title");
+       if (exists $title{$page} && $template->query(name => "title")) {
+               $template->param(title => $title{$page});
+               $template->param(title_overridden => 1);
+       }
+       $template->param(permalink => $permalink{$page})
+               if exists $permalink{$page} && $template->query(name => "permalink");
+       $template->param(author => $author{$page})
+               if exists $author{$page} && $template->query(name => "author");
+       $template->param(authorurl => $authorurl{$page})
+               if exists $authorurl{$page} && $template->query(name => "authorurl");
+       

 } # }}}
 
 1
 } # }}}
 
 1