* Patch from James Westby to add an actions option to inline; this

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index adfd688a6aeece5cdf1f55b8578727ffbc111369..9b026fffa3c3c57480643bb424834abb6e50efbc 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -62,6 +62,7 @@ sub preprocess (@) { #{{{
        }
        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).
@@ -84,8 +85,10 @@ sub pagetemplate (@) { #{{{
 
        $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})