urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
master
Joey Hess 2007-12-28 16:55:20 -05:00
parent f2c4939f38
commit 63f62ef520
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/conditional.pm
View File

@ -24,7 +24,7 @@ sub preprocess_if (@) { #{{{
# An optimisation to avoid needless looping over every page # An optimisation to avoid needless looping over every page
# and adding of dependencies for simple uses of some of the # and adding of dependencies for simple uses of some of the
# tests. # tests.
$params{test} =~ /^(enabled|sourcepage|destpage)\((.*)\)$/) { $params{test} =~ /^\s*\!?\s*(enabled|sourcepage|destpage|included)\((.*)\)\s*$/) {
add_depends($params{page}, "$params{test} and $params{page}"); add_depends($params{page}, "$params{test} and $params{page}");
$result=pagespec_match($params{page}, $params{test}, $result=pagespec_match($params{page}, $params{test},
location => $params{page}, location => $params{page},

3
debian/changelog vendored
View File

@ -4,6 +4,9 @@ ikiwiki (2.17) UNRELEASED; urgency=low
* redir: Support for specifying anchors. * redir: Support for specifying anchors.
* img: Avoid nesting images when linking to another image. Closes: #457780 * img: Avoid nesting images when linking to another image. Closes: #457780
* img: Allow the link parameter to point to an exterior url. * 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 -- Joey Hess <joeyh@debian.org> Wed, 19 Dec 2007 16:39:07 -0500