From: Joey Hess <joey@kitenet.net>
Date: Mon, 12 Jul 2010 19:39:32 +0000 (-0400)
Subject: merged filter-full
X-Git-Tag: 3.20100722~44
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0eee3fe2a210c0f4ef581259e5e45c49ad1dfada?hp=fd2b2f386f30cf2ba578da8a8174dd60ae024adc

merged filter-full
---

diff --git a/debian/changelog b/debian/changelog
index 3a581cccb..699fae7fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,13 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * Add --changesetup mode that allows easily changing options in a
     setup file.
   * openid: Fix handling of utf-8 nicknames.
+  * Clarified what the filter hook should be passed: Only be the raw,
+    complete text of a page. Not a snippet, or data read in from an
+    unrelated file.
+  * template: Do not pass filled in template through filter hook.
+    Avoids causing breakage in po plugin.
+  * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
+    avoid unnecessary calls to filter hook.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index 9fd0de694..d826546e6 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -45,4 +45,4 @@ This has been fixed in my po branch.
 >>> you found this solution, as I didn't like changing the filter
 >>> prototype. I believe you can now merge this code. --[[intrigeri]]
 
-[[!tag patch]]
+[[!tag patch done]]