diff options
| author | Joey Hess <joey@kitenet.net> | 2007-12-28 16:55:20 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2007-12-28 16:55:20 -0500 |
| commit | 63f62ef52059c4acc1306e50dd32671a20bd9d55 (patch) | |
| tree | 357dd28420620cffd9b9d4bc701e1efd8d634602 | |
| parent | f2c4939f3869e2678577b4274519702b5cea203c (diff) | |
| download | ikiwiki-63f62ef52059c4acc1306e50dd32671a20bd9d55.tar ikiwiki-63f62ef52059c4acc1306e50dd32671a20bd9d55.tar.gz | |
* conditional: Improve regexp testing for simple uses of pagespecs
that match only the page using the directive, adding 'included()'
and supporting negated pagespecs and added whitespace.
| -rw-r--r-- | IkiWiki/Plugin/conditional.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm index 2a25135fe..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}, diff --git a/debian/changelog b/debian/changelog index aca79c6d1..c48d538e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ ikiwiki (2.17) UNRELEASED; urgency=low * redir: Support for specifying anchors. * img: Avoid nesting images when linking to another image. Closes: #457780 * img: Allow the link parameter to point to an exterior url. + * conditional: Improve regexp testing for simple uses of pagespecs + that match only the page using the directive, adding 'included()' + and supporting negated pagespecs and added whitespace. -- Joey Hess <joeyh@debian.org> Wed, 19 Dec 2007 16:39:07 -0500 |