From 0bc199e6d7df436ff506f590a459e1cd24478eac Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Wed, 9 Jan 2008 03:41:06 -0500 Subject: [PATCH] fixed bug where some template data variables were being parsed for template tags --- template.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/template.php b/template.php index d54bf35..5b03754 100644 --- a/template.php +++ b/template.php @@ -290,7 +290,8 @@ function tem_output($filename = false) { # this is used in template_run() and should be of no other use function template_filler($matches) { - list($tag, $enc) = explode('.', $matches[1], 2); + $match = array_pop($matches); + list($tag, $enc) = explode('.', $match, 2); $value = $GLOBALS['wfpl_template_keyval'][$tag]; if($enc) { $encs = explode('.', $enc); @@ -312,7 +313,7 @@ function template_filler($matches) { # returns the result. function template_run($template, &$keyval) { $GLOBALS['wfpl_template_keyval'] =& $keyval; - return preg_replace_callback(array('||', '|~([^~]*)~|', '|([^<]*)|', '|

([^<]*)

|'), 'template_filler', $template); + return preg_replace_callback('`|~([^~]*)~|([^<]*)|

([^<]*)

`', 'template_filler', $template); } function tem_top_sub_names() { -- 1.7.10.4