Merge branch 'autotag'

[git.ikiwiki.info.git] / IkiWiki / Plugin / conditional.pm

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index beeddc67273156216488c3aab8ca84f5e4e56b6c..8a57961491942438864c87a6ff1662b7d60a6439 100644 (file)
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -16,7 +16,7 @@ sub getsetup {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

-                       section => "core",
+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -30,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\!()]*)+$/) {