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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 666a625e67310932e6c85334924e6f37743d53e1..668de7e9368be67c12425e8acb13c2355e548fe1 100644 (file)
--- 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 f85517c04f2c7270fb520f5e47046d8cdd186056..c9fd64a2a977d3ac851b9d0e5063d076477e38fb 100644 (file)
--- 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 634ae59e2d5db5bfabd2fba26eacdee3de885ab7..a6c77b51ac750b271c962453d03aa081bab0ef05 100644 (file)
--- 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]]