X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/330bbd03df8f41cf6e8036dbfc764dabddcd6715..906dcfd518c9597dd68ddf30c28bb68e9cbf8555:/IkiWiki/Plugin/meta.pm
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index d04bc1d51..a4dd541f9 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -11,6 +11,8 @@ my %title;
my %permalink;
my %author;
my %authorurl;
+my %license;
+my %copyright;
sub import { #{{{
hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
@@ -45,6 +47,7 @@ sub preprocess (@) { #{{{
delete $params{$key};
my $page=$params{page};
delete $params{page};
+ my $destpage=$params{destpage};
delete $params{destpage};
delete $params{preview};
@@ -65,7 +68,7 @@ sub preprocess (@) { #{{{
}
}
elsif ($key eq 'title') {
- $title{$page}=$value;
+ $title{$page}=HTML::Entities::encode_numeric($value);
}
elsif ($key eq 'permalink') {
$permalink{$page}=$value;
@@ -87,10 +90,10 @@ sub preprocess (@) { #{{{
if (! length $stylesheet) {
return "[[meta ".gettext("stylesheet not found")."]]";
}
- $meta{$page}.='\n";
+ "\" type=\"text/css\" />\n";
}
elsif ($key eq 'openid') {
if (exists $params{server}) {
@@ -100,6 +103,14 @@ sub preprocess (@) { #{{{
$meta{$page}.='\n";
}
+ elsif ($key eq 'license') {
+ $meta{$page}.="\n";
+ $license{$page}=IkiWiki::linkify($page, $destpage, $value);
+ }
+ elsif ($key eq 'copyright') {
+ $meta{$page}.="\n";
+ $copyright{$page}=IkiWiki::linkify($page, $destpage, $value);
+ }
else {
$meta{$page}.=scrub("\n");
@@ -131,6 +142,10 @@ sub pagetemplate (@) { #{{{
if exists $author{$page} && $template->query(name => "author");
$template->param(authorurl => $authorurl{$page})
if exists $authorurl{$page} && $template->query(name => "authorurl");
+ $template->param(license => $license{$page})
+ if exists $license{$page} && $template->query(name => "license");
+ $template->param(copyright => $copyright{$page})
+ if exists $copyright{$page} && $template->query(name => "copyright");
} # }}}