X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/127bceef5b4799e58cb068043e49ed16a3ec840d..279db7860dc98bedbd8333bb7de57251dcfb223d:/IkiWiki/Plugin/conditional.pm diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm index 6c14361f7..57db01054 100644 --- a/IkiWiki/Plugin/conditional.pm +++ b/IkiWiki/Plugin/conditional.pm @@ -24,7 +24,7 @@ sub preprocess_if (@) { #{{{ # An optimisation to avoid needless looping over every page # and adding of dependencies for simple uses of some of the # tests. - $params{test} =~ /^(enabled|sourcepage|destpage)\((.*)\)$/) { + $params{test} =~ /^\s*\!?\s*(enabled|sourcepage|destpage|included)\((.*)\)\s*$/) { add_depends($params{page}, "$params{test} and $params{page}"); $result=pagespec_match($params{page}, $params{test}, location => $params{page}, @@ -56,7 +56,7 @@ sub preprocess_if (@) { #{{{ $ret=""; } return IkiWiki::preprocess($params{page}, $params{destpage}, - IkiWiki::filter($params{page}, $ret)); + IkiWiki::filter($params{page}, $params{destpage}, $ret)); } # }}} package IkiWiki::PageSpec; @@ -102,7 +102,7 @@ sub match_destpage ($$;@) { #{{{ } } #}}} -sub match_included ($$;$) { #{{{ +sub match_included ($$;@) { #{{{ shift; shift; my %params=@_;