From 4ed5b5acab3aaf9a63b568ea79a22dc1e4a98329 Mon Sep 17 00:00:00 2001 From: boots Date: Thu, 25 May 2006 14:46:18 +0000 Subject: [PATCH] un-hide hidden xml open tags --- NEWS | 2 +- libs/Smarty_Compiler.class.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 8ed4058f..e8e4df3c 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -- separate handling of comment blocks from 'special blocks' (boots) +- un-hide hidden xml open tags (boots) - fix handling of block-methods of registered objects (El Hombre Gris, messju) diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php index c6602270..7795e558 100644 --- a/libs/Smarty_Compiler.class.php +++ b/libs/Smarty_Compiler.class.php @@ -240,8 +240,8 @@ class Smarty_Compiler extends Smarty { $ldq = preg_quote($this->left_delimiter, '~'); $rdq = preg_quote($this->right_delimiter, '~'); - /* kill comments */ - $source_content = preg_replace("~{$ldq}\*(.*?)\*{$rdq}~", '', $source_content); + /* un-hide hidden xml open tags */ + $source_content = preg_replace("~<({$ldq}(.*?){$rdq})[?]~s", '< \\1', $source_content); // run template source through prefilter functions if (count($this->_plugins['prefilter']) > 0) { @@ -258,7 +258,7 @@ class Smarty_Compiler extends Smarty { } /* fetch all special blocks */ - $search = "~{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}|{$ldq}\s*php\s*{$rdq}(.*?){$ldq}\s*/php\s*{$rdq}~s"; + $search = "~{$ldq}\*(.*?)\*{$rdq}|{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}|{$ldq}\s*php\s*{$rdq}(.*?){$ldq}\s*/php\s*{$rdq}~s"; preg_match_all($search, $source_content, $match, PREG_SET_ORDER); $this->_folded_blocks = $match;