From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 17 Mar 2008 17:08:16 +0000 (-0400)
Subject: * Correct bug in encoding of %pagestate keys, fixes edittemplate.
X-Git-Tag: 2.41~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52d9f8e9f38f03efd0b1662f3f2d20ce115ed099;p=ikiwiki.git

* Correct bug in encoding of %pagestate keys, fixes edittemplate.
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 666a625e6..668de7e93 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -962,7 +962,7 @@ sub saveindex () { #{{{
 		if (exists $pagestate{$page}) {
 			foreach my $id (@hookids) {
 				foreach my $key (keys %{$pagestate{$page}{$id}}) {
-					$line.=' '.$id.'_'.encode_entities($key)."=".encode_entities($pagestate{$page}{$id}{$key}, " \t\n");
+					$line.=' '.$id.'_'.encode_entities($key, " \t\n")."=".encode_entities($pagestate{$page}{$id}{$key}, " \t\n");
 				}
 			}
 		}
diff --git a/debian/changelog b/debian/changelog
index f85517c04..c9fd64a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ ikiwiki (2.41) UNRELEASED; urgency=low
   * htmltidy: Pass --markup yes, in case tidy's config file disabled it.
   * external: Add getargv and setargv methods to allow access to ikiwiki's
     @ARGV.
+  * Correct bug in encoding of %pagestate keys, fixes edittemplate.
 
  -- martin f. krafft <madduck@debian.org>  Sun, 02 Mar 2008 17:46:38 +0100
 
diff --git a/doc/bugs/edittemplate_seems_not_to_be_working.mdwn b/doc/bugs/edittemplate_seems_not_to_be_working.mdwn
index 634ae59e2..a6c77b51a 100644
--- a/doc/bugs/edittemplate_seems_not_to_be_working.mdwn
+++ b/doc/bugs/edittemplate_seems_not_to_be_working.mdwn
@@ -3,3 +3,5 @@ I tried to use [[the_edittemplate_plugin|plugins/edittemplate]] on <http://vcs-p
 I hope I am not doing something wrong...
 
 --[[madduck]]
+
+> [[fixed|done]] --[[Joey]]