smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

move Smarty::quote_replace() to Smarty_Compiler::_quote_replace()

Browse Source
This commit is contained in:
messju
2003-11-18 23:35:05 +00:00
parent 209cd6efeb
commit f903d313b4
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -1,3 +1,7 @@
- move Smarty::quote_replace() to Smarty_Compiler::_quote_replace() (messju)
- remove import of of attributes of {include_php} to php's namespace.
use $params[name] instead (messju)
Version 2.6.0-RC3 (Nov 13, 2003) Version 2.6.0-RC3 (Nov 13, 2003)
-------------------------------- --------------------------------

11
libs/Smarty.class.php
View File

@@ -1389,17 +1389,6 @@ class Smarty
} }
} }
/**
* Quote subpattern references
*
* @param string $string
* @return string
*/
function quote_replace($string)
{
return preg_replace('![\\$]\d!', '\\\\\\0', $string);
}
/** /**
* get filepath of requested plugin * get filepath of requested plugin
* *

17
libs/Smarty_Compiler.class.php
View File

@@ -265,13 +265,13 @@ class Smarty_Compiler extends Smarty {
preg_match_all("!{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}!s", $source_content, $_match); preg_match_all("!{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}!s", $source_content, $_match);
$this->_literal_blocks = $_match[1]; $this->_literal_blocks = $_match[1];
$source_content = preg_replace("!{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}!s", $source_content = preg_replace("!{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}!s",
$this->quote_replace($this->left_delimiter.'literal'.$this->right_delimiter), $source_content); $this->_quote_replace($this->left_delimiter.'literal'.$this->right_delimiter), $source_content);
/* Pull out the php code blocks. */ /* Pull out the php code blocks. */
preg_match_all("!{$ldq}php{$rdq}(.*?){$ldq}/php{$rdq}!s", $source_content, $_match); preg_match_all("!{$ldq}php{$rdq}(.*?){$ldq}/php{$rdq}!s", $source_content, $_match);
$this->_php_blocks = $_match[1]; $this->_php_blocks = $_match[1];
$source_content = preg_replace("!{$ldq}php{$rdq}(.*?){$ldq}/php{$rdq}!s", $source_content = preg_replace("!{$ldq}php{$rdq}(.*?){$ldq}/php{$rdq}!s",
$this->quote_replace($this->left_delimiter.'php'.$this->right_delimiter), $source_content); $this->_quote_replace($this->left_delimiter.'php'.$this->right_delimiter), $source_content);
/* Gather all template tags. */ /* Gather all template tags. */
preg_match_all("!{$ldq}\s*(.*?)\s*{$rdq}!s", $source_content, $_match); preg_match_all("!{$ldq}\s*(.*?)\s*{$rdq}!s", $source_content, $_match);
@@ -336,7 +336,7 @@ class Smarty_Compiler extends Smarty {
$strip_tags_modified = preg_replace('![\r\n]+!m', '', $strip_tags_modified); $strip_tags_modified = preg_replace('![\r\n]+!m', '', $strip_tags_modified);
for ($i = 0, $for_max = count($strip_tags); $i < $for_max; $i++) for ($i = 0, $for_max = count($strip_tags); $i < $for_max; $i++)
$compiled_content = preg_replace("!{$ldq}strip{$rdq}.*?{$ldq}/strip{$rdq}!s", $compiled_content = preg_replace("!{$ldq}strip{$rdq}.*?{$ldq}/strip{$rdq}!s",
$this->quote_replace($strip_tags_modified[$i]), $this->_quote_replace($strip_tags_modified[$i]),
$compiled_content, 1); $compiled_content, 1);
} }
@@ -2032,6 +2032,17 @@ class Smarty_Compiler extends Smarty {
} }
/**
* Quote subpattern references
*
* @param string $string
* @return string
*/
function _quote_replace($string)
{
return preg_replace('![\\$]\d!', '\\\\\\0', $string);
}
/** /**
* display Smarty syntax error * display Smarty syntax error
* *