proxy: update string formatting and error catching syntax

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

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index aad617812fc69229aa9ffa6979570d078f090023..0a3d7fb4cd18ef14261eb6896722c0991d8405dd 100644 (file)
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -4,7 +4,6 @@ package IkiWiki::Plugin::conditional;
 use warnings;
 use strict;
 use IkiWiki 3.00;
 use warnings;
 use strict;
 use IkiWiki 3.00;

-use UNIVERSAL;

 
 sub import {
        hook(type => "getsetup", id => "conditional", call => \&getsetup);
 
 sub import {
        hook(type => "getsetup", id => "conditional", call => \&getsetup);


@@ -16,6 +15,7 @@ sub getsetup {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -29,7 +29,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 +58,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;