Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove link spam
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
conditional.pm
diff --git
a/IkiWiki/Plugin/conditional.pm
b/IkiWiki/Plugin/conditional.pm
index aad617812fc69229aa9ffa6979570d078f090023..026078b3ccf6751c26418d329a62f715b1bb5252 100644
(file)
--- a/
IkiWiki/Plugin/conditional.pm
+++ b/
IkiWiki/Plugin/conditional.pm
@@
-16,6
+16,7
@@
sub getsetup {
plugin => {
safe => 1,
rebuild => undef,
plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
}
},
}
@@
-29,7
+30,7
@@
sub preprocess_if (@) {
}
my $result=0;
}
my $result=0;
- if (
! IkiWiki::yesno($params{all}
) ||
+ if (
(exists $params{all} && ! IkiWiki::yesno($params{all})
) ||
# An optimisation to avoid needless looping over every page
# for simple uses of some of the tests.
$params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
# An optimisation to avoid needless looping over every page
# for simple uses of some of the tests.
$params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
@@
-58,8
+59,7
@@
sub preprocess_if (@) {
else {
$ret="";
}
else {
$ret="";
}
- return IkiWiki::preprocess($params{page}, $params{destpage},
- IkiWiki::filter($params{page}, $params{destpage}, $ret));
+ return IkiWiki::preprocess($params{page}, $params{destpage}, $ret);
}
package IkiWiki::PageSpec;
}
package IkiWiki::PageSpec;