aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/conditional.pm
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-14 00:11:19 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-14 00:11:19 +0000
commit6fc66f83deba6df8abdf4bc117f8da7efbd7cbc1 (patch)
treeb65261ec25063bea8fd8e8b4793917fea65768de /IkiWiki/Plugin/conditional.pm
parent433832b020c6464938992293c15cc8cdcfbd18f7 (diff)
downloadikiwiki-6fc66f83deba6df8abdf4bc117f8da7efbd7cbc1.tar
ikiwiki-6fc66f83deba6df8abdf4bc117f8da7efbd7cbc1.tar.gz
* Fix the template, toggle, and conditional plugins to filter text before
preprocessing it. * Fix smiley plugin to support smileys at the very beginning or end of the content.
Diffstat (limited to 'IkiWiki/Plugin/conditional.pm')
-rw-r--r--IkiWiki/Plugin/conditional.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 35418a3ba..293fbc191 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -53,7 +53,8 @@ sub preprocess_if (@) { #{{{
else {
$ret="";
}
- return IkiWiki::preprocess($params{page}, $params{destpage}, $ret);
+ return IkiWiki::preprocess($params{page}, $params{destpage},
+ IkiWiki::filter($params{page}, $ret));
} # }}}
package IkiWiki::PageSpec;