From 127bceef5b4799e58cb068043e49ed16a3ec840d Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 9 May 2007 00:31:49 +0000
Subject: * Add all=no option to conditional, can be used to form conditionals
 that do   not need to examine every page in the wiki. * Use this to simplify
 the goodstuff detection in the plugin template.

---
 doc/plugins/conditional.mdwn | 10 ++++++++--
 doc/templates/plugin.mdwn    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn
index a8dd21589..ba1cf9bb2 100644
--- a/doc/plugins/conditional.mdwn
+++ b/doc/plugins/conditional.mdwn
@@ -18,8 +18,14 @@ quotes to be included.
 The `test` is a [[PageSpec]]; if it matches any page in the wiki then it
 succeeds. So you can do things like testing for the existence of a page or
 pages, testing to see if any pages were created in a given month, and so
-on. The regular [[PageSpec]] syntax is expanded with the following
-additional tests:
+on.
+
+If you want the [[PageSpec]] to only match against the page that
+contains the conditional, rather than matching against all pages in the
+wiki, set the "all" parameter to "no".
+
+The regular [[PageSpec]] syntax is expanded with the following additional
+tests:
 
 * enabled(plugin)
 
diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index cb67902ea..b8421fafb 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -3,7 +3,7 @@ Plugin: <TMPL_VAR name><br />
 Author: <TMPL_VAR author><br />
 Included in ikiwiki: [[if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]<br />
 Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
-Included in [[/plugins/goodstuff]]: [[if test="backlink(plugins/goodstuff) and glob(plugins/<TMPL_VAR name>) and !sourcepage(plugins/contrib/*)" then="""yes""" else="""no"""]]<br />
+Included in [[/plugins/goodstuff]]: [[if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
 Currently enabled: [[if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
 </span>
 [[if test="sourcepage(plugins/contrib/*)" then="""[[meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
-- 
cgit v1.2.3