Do not pass ignored sid parameter to checksessionexpiry

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

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 8a57961491942438864c87a6ff1662b7d60a6439..b450f1a0a1cea267e3e2791376142c67438f03b9 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);


@@ -34,11 +33,15 @@ sub preprocess_if (@) {
            # 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\!()]*)+$/) {

-               add_depends($params{page}, "($params{test}) and $params{page}");

                $result=pagespec_match($params{page}, $params{test},
                                location => $params{page},
                                sourcepage => $params{page},
                                destpage => $params{destpage});
                $result=pagespec_match($params{page}, $params{test},
                                location => $params{page},
                                sourcepage => $params{page},
                                destpage => $params{destpage});

+               my $i = $result->influences;
+               foreach my $k (keys %$i) {
+                       # minor optimization: influences are always simple dependencies
+                       $IkiWiki::depends_simple{$params{page}}{lc $k} |= $i->{$k};
+               }

        }
        else {
                $result=pagespec_match_list($params{page}, $params{test},
        }
        else {
                $result=pagespec_match_list($params{page}, $params{test},


@@ -59,8 +62,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;