X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=template.php;h=5b03754f5febfdee62db00aad6c19d09a6b24e59;hb=0bc199e6d7df436ff506f590a459e1cd24478eac;hp=d54bf350c1d4ce5e192bb9fcfd0b8f71e8b6c7a6;hpb=277f0431cc57acc1b77c1fbe733c40e9ba90d710;p=wfpl.git

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('|<!--~([^~]*)~-->|', '|~([^~]*)~|', '|<span class="template">([^<]*)</span>|', '|<p class="template">([^<]*)</p>|'), 'template_filler', $template);
+	return preg_replace_callback('`<!--~([^~]*)~-->|~([^~]*)~|<span class="template">([^<]*)</span>|<p class="template">([^<]*)</p>`', 'template_filler', $template);
 }
 
 function tem_top_sub_names() {