bugfixes
parent
1e7b0415d3
commit
9dc796737f
|
@ -47,7 +47,6 @@ sub preprocess (@) { #{{{
|
|||
delete $params{$key};
|
||||
my $page=$params{page};
|
||||
delete $params{page};
|
||||
my $destpage=$params{destpage};
|
||||
delete $params{destpage};
|
||||
delete $params{preview};
|
||||
|
||||
|
@ -105,11 +104,11 @@ sub preprocess (@) { #{{{
|
|||
}
|
||||
elsif ($key eq 'license') {
|
||||
$meta{$page}.="<link rel=\"license\" href=\"#page_license\" />\n";
|
||||
$license{$page}=IkiWiki::linkify($page, $destpage, $value);
|
||||
$license{$page}=$value;
|
||||
}
|
||||
elsif ($key eq 'copyright') {
|
||||
$meta{$page}.="<link rel=\"copyright\" href=\"#page_copyright\" />\n";
|
||||
$copyright{$page}=IkiWiki::linkify($page, $destpage, $value);
|
||||
$copyright{$page}=$value;
|
||||
}
|
||||
else {
|
||||
$meta{$page}.=scrub("<meta name=\"".encode_entities($key).
|
||||
|
@ -143,16 +142,25 @@ sub pagetemplate (@) { #{{{
|
|||
if exists $author{$page} && $template->query(name => "author");
|
||||
$template->param(authorurl => $authorurl{$page})
|
||||
if exists $authorurl{$page} && $template->query(name => "authorurl");
|
||||
|
||||
if ($page ne $destpage &&
|
||||
((exists $license{$page} && ! exists $license{$destpage}) ||
|
||||
(exists $copyright{$page} && ! exists $copyright{$destpage}))) {
|
||||
# Force a scan of the destpage to get its copyright/license
|
||||
# info. If the info is declared after an inline, it will
|
||||
# otherwise not be available at this point.
|
||||
IkiWiki::scan($pagesources{$destpage});
|
||||
}
|
||||
|
||||
if (exists $license{$page} && $template->query(name => "license") &&
|
||||
($page ne $destpage || ! exists $license{$destpage} ||
|
||||
$license{$page} ne $license{$destpage})) {
|
||||
$template->param(license => $license{$page})
|
||||
($page eq $destpage || ! exists $license{$destpage} ||
|
||||
$license{$page} ne $license{$destpage})) {
|
||||
$template->param(license => IkiWiki::linkify($page, $destpage, $license{$page}));
|
||||
}
|
||||
if (exists $copyright{$page} && $template->query(name => "copyright") &&
|
||||
($page ne $destpage || ! exists $copyright{$destpage} ||
|
||||
$copyright{$page} ne $copyright{$destpage})) {
|
||||
$template->param(copyright => $copyright{$page})
|
||||
($page eq $destpage || ! exists $copyright{$destpage} ||
|
||||
$copyright{$page} ne $copyright{$destpage})) {
|
||||
$template->param(copyright => IkiWiki::linkify($page, $destpage, $copyright{$page}));
|
||||
}
|
||||
} # }}}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2007-09-14 14:10-0400\n"
|
||||
"POT-Creation-Date: 2007-09-14 20:21-0400\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
@ -213,7 +213,7 @@ msgstr ""
|
|||
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
|
||||
msgstr ""
|
||||
|
||||
#: ../IkiWiki/Plugin/meta.pm:92
|
||||
#: ../IkiWiki/Plugin/meta.pm:90
|
||||
msgid "stylesheet not found"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
@ -32,14 +32,12 @@ Tags:
|
|||
|
||||
<TMPL_IF COPYRIGHT>
|
||||
<div class="copyright">
|
||||
<a name="page_copyright"></a>
|
||||
<TMPL_VAR COPYRIGHT>
|
||||
</div>
|
||||
</TMPL_IF>
|
||||
|
||||
<TMPL_IF LICENSE>
|
||||
<div class="license">
|
||||
<a name="page_license"></a>
|
||||
License: <TMPL_VAR LICENSE>
|
||||
</div>
|
||||
</TMPL_IF>
|
||||
|
|
Loading…
Reference in New Issue