summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-03-17 13:08:16 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-03-17 13:08:16 -0400
commit52d9f8e9f38f03efd0b1662f3f2d20ce115ed099 (patch)
treeab1245ba13f2f69a613163e1d0213fe53b53f300
parent57a41b663d438cbc99a3a0132cb4c7b69bb2d97e (diff)
* Correct bug in encoding of %pagestate keys, fixes edittemplate.
-rw-r--r--IkiWiki.pm2
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/edittemplate_seems_not_to_be_working.mdwn2
3 files changed, 4 insertions, 1 deletions
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]]