From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 18 Feb 2009 00:37:49 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/3df883ba94d7b06697ce15bed2058768bc8de006?hp=edad904f4c3b8621d11cd4e45e7bc5a669752d11

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 7cc8cb484..06ec0bdca 100644
--- 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 57bff20ff..b872f0962 100644
--- 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 62374d2dc..b644ac99c 100644
--- 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 48288a2b3..de6c227f6 100644
--- 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 ea0eecc80..4fe9a4723 100644
--- 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]]