diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-04-15 18:18:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-04-15 18:18:48 -0400 |
| commit | 50d08bc2aea1d8d52e07ae1750e73b722bd2db24 (patch) | |
| tree | 3ba6260f2726c3887e00b9f18cb4a89fd6986656 | |
| parent | a0a472d57716466fba9d8f39e7586b3ca0d17578 (diff) | |
| download | ikiwiki-50d08bc2aea1d8d52e07ae1750e73b722bd2db24.tar ikiwiki-50d08bc2aea1d8d52e07ae1750e73b722bd2db24.tar.gz | |
conditional: Fix bug that forced "all" mode off by default.
Commit b7351daacd0d4a041a51b43d99b7bf589de54f53 introduced the bug.
| -rw-r--r-- | IkiWiki/Plugin/conditional.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm index 892b1cff9..8a5796149 100644 --- a/IkiWiki/Plugin/conditional.pm +++ b/IkiWiki/Plugin/conditional.pm @@ -30,7 +30,7 @@ sub preprocess_if (@) { } 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\!()]*)+$/) { diff --git a/debian/changelog b/debian/changelog index c379253d7..dfb94ae22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low shown on a page. * Enable calendar and sidebar in auto-blog.setup. * sidebar: Add global_sidebars setting. + * conditional: Fix bug that forced "all" mode off by default. -- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400 |