X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4d8b2d84d5635e0e718e9f66fcdf6e20587fbc2c..88576fd762962c6f287850c9a4553547e2938974:/IkiWiki/Plugin/conditional.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm index ed533109a..22057c135 100644 --- a/IkiWiki/Plugin/conditional.pm +++ b/IkiWiki/Plugin/conditional.pm @@ -28,7 +28,7 @@ sub preprocess_if (@) { #{{{ # tests. if ($params{test} =~ /^(enabled|sourcepage|destpage)\((.*)\)$/) { $result=eval "IkiWiki::PageSpec::match_$1(undef, ". - IkiWiki::safequote($2).")"; + IkiWiki::safequote($2).", \$params{page})"; } else { add_depends($params{page}, $params{test}); @@ -59,7 +59,7 @@ sub preprocess_if (@) { #{{{ package IkiWiki::PageSpec; -sub match_enabled ($$) { #{{{ +sub match_enabled ($$$) { #{{{ shift; my $plugin=shift; @@ -67,7 +67,7 @@ sub match_enabled ($$) { #{{{ return UNIVERSAL::can("IkiWiki::Plugin::".$plugin, "import"); } #}}} -sub match_sourcepage ($$) { #{{{ +sub match_sourcepage ($$$) { #{{{ shift; my $glob=shift; @@ -75,7 +75,7 @@ sub match_sourcepage ($$) { #{{{ $IkiWiki::Plugin::conditional::sourcepage); } #}}} -sub match_destpage ($$) { #{{{ +sub match_destpage ($$$) { #{{{ shift; my $glob=shift; @@ -83,7 +83,7 @@ sub match_destpage ($$) { #{{{ $IkiWiki::Plugin::conditional::sourcepage); } #}}} -sub match_included ($$) { #{{{ +sub match_included ($$$) { #{{{ return $IkiWiki::Plugin::conditional::sourcepage ne $IkiWiki::Plugin::conditional::destpage; } #}}}