X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8fa8bd0adb034f05131648dcb7b14011672649e8..c9aac86735d73efc449ee20e1b366122fb55c4e1:/IkiWiki/Plugin/conditional.pm

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index a7ed6590e..e787424aa 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -7,21 +7,34 @@ use IkiWiki 2.00;
 use UNIVERSAL;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "conditional", call => \&getsetup);
 	hook(type => "preprocess", id => "if", call => \&preprocess_if);
 } # }}}
 
+sub getsetup { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
 sub preprocess_if (@) { #{{{
 	my %params=@_;
 
-	if (! exists $params{test} || ! exists $params{then}) {
-		return "[[if ".gettext('"test" and "then" parameters are required')."]]";
+	foreach my $param (qw{test then}) {
+		if (! exists $params{$param}) {
+			error sprintf(gettext('%s parameter is required'), $param);
+		}
 	}
 
 	my $result=0;
-	# An optimisation to avoid needless looping over every page
-	# and adding of dependencies for simple uses of some of the
-	# tests.
-	if ($params{test} =~ /^(enabled|sourcepage|destpage)\((.*)\)$/) {
+	if ((exists $params{all} && lc $params{all} eq "no") ||
+		# An optimisation to avoid needless looping over every page
+		# and adding of dependencies 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},
@@ -52,7 +65,7 @@ sub preprocess_if (@) { #{{{
 		$ret="";
 	}
 	return IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $ret));
+		IkiWiki::filter($params{page}, $params{destpage}, $ret));
 } # }}}
 
 package IkiWiki::PageSpec;
@@ -98,7 +111,7 @@ sub match_destpage ($$;@) { #{{{
 	}
 } #}}}
 
-sub match_included ($$;$) { #{{{
+sub match_included ($$;@) { #{{{
 	shift;
 	shift;
 	my %params=@_;