summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/conditional.pm2
-rw-r--r--debian/changelog1
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