Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 7cc8cb4840f42ec8817ad1ae0a9cec726694b9f0..06ec0bdca476d8d99640358660c5454c5462e426 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -38,7 +38,7 @@ sub cgi_goto ($;$) {
        # permalink. Comments do.
        if (IkiWiki::isinternal($page) &&
            defined $pagestate{$page}{meta}{permalink}) {
-               redirect($q, $pagestate{$page}{meta}{permalink});
+               IkiWiki::redirect($q, $pagestate{$page}{meta}{permalink});
        }
 
        my $link = bestlink("", $page);

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 57bff20ff32ba57ce3e19ff9c2e5ec5d01bcb927..b872f0962a2b410f7c2cc35cc8c9d82df94a98a1 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -10,7 +10,8 @@ use Encode;
 
 sub import {
        hook(type => "getsetup", id => "template", call => \&getsetup);
-       hook(type => "preprocess", id => "template", call => \&preprocess);
+       hook(type => "preprocess", id => "template", call => \&preprocess,
+               scan => 1);
 }
 
 sub getsetup () {

diff --git a/debian/changelog b/debian/changelog
index 62374d2dc6aa1737509b3671e1e59e441ddc2009..b644ac99c17f8adea2a5ebe62ea8e7e47acb48dc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 ikiwiki (3.05) UNRELEASED; urgency=low
 
   * debhelper v7.2; rules file minimisation.
+  * template: Load templates in scan mode.
+    This is potentially expensive, but is necessary so that meta and tag
+    directives, and other links on templates affect the page using the
+    template reliably.
+  * goto: Fix redirect to comments.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 

diff --git a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
index 48288a2b3561021016ca49048593f54d9b867f3a..de6c227f62f0afb147cf02907acb61a9da21c38e 100644 (file)
--- a/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
+++ b/doc/bugs/cannot_reliably_use_meta_in_template.mdwn
@@ -14,3 +14,5 @@ scan pass, every page containing a template will cause the template to be
 loaded and filled out. This can be some serious additional overhead.
 
 --[[Joey]] 
+
+[[done]]

diff --git a/doc/bugs/tags__44___backlinks_and_3.x.mdwn b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
index ea0eecc80f4f5f1c1cf0839351ec7e9f16276545..4fe9a47230d1844c02ecd4b85707409825d381e9 100644 (file)
--- a/doc/bugs/tags__44___backlinks_and_3.x.mdwn
+++ b/doc/bugs/tags__44___backlinks_and_3.x.mdwn
@@ -30,3 +30,5 @@ time, so went ahead and migrated live, spamming planet debian in the process
 > [[cannot_reliably_use_meta_in_template]]. AFAIK, this has never worked
 > reliably, although the linked page has a simple, though potentially
 > expensive fix. --[[Joey]] 
+
+> fix made, [[done]] --[[Joey]]