smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-11-02 21:31:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix order of php tag comparisons

Browse Source
This commit is contained in:
mohrt
2003-01-30 16:48:55 +00:00
parent 71b0cc207b
commit 8266f8660e
4 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/Smarty_Compiler.class.php
View File

@@ -247,6 +247,8 @@ class Smarty_Compiler extends Smarty {
/* match anything resembling php tags */
if (preg_match_all('!(<\?(?:\w+|=)?|\?>|language\s*=\s*[\"\']?php[\"\']?)!is', $text_blocks[$curr_tb], $sp_match)) {
/* replace tags with placeholders to prevent recursive replacements */
$sp_match[1] = array_unique($sp_match[1]);
usort($sp_match[1], '_smarty_sort_length');
for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
$text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp],'%%%SMARTYSP'.$curr_sp.'%%%',$text_blocks[$curr_tb]);
}
@@ -264,7 +266,7 @@ class Smarty_Compiler extends Smarty {
} else {
/* SMARTY_PHP_ALLOW, but echo non php starting tags */
$sp_match[1][$curr_sp] = preg_replace('%(<\?(?!php|=|$))%i', '<?php echo \'\\1\'?>'."\n", $sp_match[1][$curr_sp]);
$text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%',$sp_match[1][$curr_sp],$text_blocks[$curr_tb]);
$text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', $sp_match[1][$curr_sp], $text_blocks[$curr_tb]);
}
}
}
@@ -343,7 +345,6 @@ class Smarty_Compiler extends Smarty {
return true;
}
/**
* Compile a template tag
*
@@ -1818,6 +1819,25 @@ class Smarty_Compiler extends Smarty {
}
}
/**
* compare to values by their string length
*
* @access private
* @param $a
* @param $b
*/
function _smarty_sort_length($a, $b)
{
if($a == $b)
return 0;
if(strlen($a) == strlen($b))
return ($a > $b) ? -1 : 1;
return (strlen($a) > strlen($b)) ? -1 : 1;
}
/* vim: set et: */
?>