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

[www/ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cdc0ab74e76e9e541f17887a12d286f75aea773a..668de7e9368be67c12425e8acb13c2355e548fe1 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -658,7 +658,7 @@ sub linkify ($$$) { #{{{
        run_hooks(linkify => sub {
                $content=shift->(
                        page => $page,
-                       destpage => $page,
+                       destpage => $destpage,
                        content => $content,
                );
        });
@@ -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");
                                }
                        }
                }