fix setvar

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index cdc0ab74e76e9e541f17887a12d286f75aea773a..bd804269dd16fee904743a59bd9ce33428479e4b 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");
                                }
                        }
                }
@@ -1106,6 +1106,8 @@ sub add_depends ($$) { #{{{
        my $page=shift;
        my $pagespec=shift;
        
+       return unless pagespec_valid($pagespec);
+
        if (! exists $depends{$page}) {
                $depends{$page}=$pagespec;
        }
@@ -1234,6 +1236,17 @@ sub pagespec_match ($$;@) { #{{{
        return $ret;
 } #}}}
 
+sub pagespec_valid ($) { #{{{
+       my $spec=shift;
+
+       # used by generated code
+       my $page="";
+       my @params;
+
+       eval pagespec_translate($spec);
+       return ! $@;
+} #}}}
+
 package IkiWiki::FailReason;
 
 use overload ( #{{{