bugfixes

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 273be135ae32d0980c41a8fcc96e47352010ac9b..938a28e59f83851f53e8d68c2776c2ee37e115f9 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -47,7 +47,6 @@ sub preprocess (@) { #{{{
        delete $params{$key};
        my $page=$params{page};
        delete $params{page};
        delete $params{$key};
        my $page=$params{page};
        delete $params{page};

-       my $destpage=$params{destpage};

        delete $params{destpage};
        delete $params{preview};
 
        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";
        }
        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";
        }
        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).
        }
        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 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") &&
 
        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") &&
        }
        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}));

        }
 } # }}}
 
        }
 } # }}}
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index baa053426971331cded39023998fe22badc2461a..2005a9f5170c99de44f887b3bc1cb1dee0a38b79 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 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"
 "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 ""
 
 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 ""
 
 msgid "stylesheet not found"
 msgstr ""
 

diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 17043b6083f120690bc8a570fd93a4df6b1f0e15..ad5e1542533e10e36a9bb5c1e405adc8c78f7b31 100644 (file)
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -32,14 +32,12 @@ Tags:
 
 <TMPL_IF COPYRIGHT>
 <div class="copyright">
 
 <TMPL_IF COPYRIGHT>
 <div class="copyright">

-<a name="page_copyright"></a>

 <TMPL_VAR COPYRIGHT>
 </div>
 </TMPL_IF>
 
 <TMPL_IF LICENSE>
 <div class="license">
 <TMPL_VAR COPYRIGHT>
 </div>
 </TMPL_IF>
 
 <TMPL_IF LICENSE>
 <div class="license">

-<a name="page_license"></a>

 License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>