cvs: smarty /libs Smarty_Compiler.class.php
"Messju Mohr" <[email protected]>
| Newsgroups | gmane.comp.php.cvs.smarty |
|---|---|
| Message-ID | <cvsmessju1095780484@cvsserver> |
messju Tue Sep 21 11:28:04 2004 EDT
Modified files:
/smarty/libs Smarty_Compiler.class.php
Log:
fixed handling of object derefence inside backticks
http://cvs.php.net/diff.php/smarty/libs/Smarty_Compiler.class.php?r1=1.347&r2=1.348&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.347 smarty/libs/Smarty_Compiler.class.php:1.348
--- smarty/libs/Smarty_Compiler.class.php:1.347 Fri Sep 17 22:09:35 2004
+++ smarty/libs/Smarty_Compiler.class.php Tue Sep 21 11:28:04 2004
@@ -26,7 +26,7 @@
* @package Smarty
*/
-/* $Id: Smarty_Compiler.class.php,v 1.347 2004/09/18 02:09:35 boots Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.348 2004/09/21 15:28:04 messju Exp $ */
/**
* Template compiling class
@@ -1641,7 +1641,7 @@
function _expand_quoted_text($var_expr)
{
// if contains unescaped $, expand it
- if(preg_match_all('~(?:\`(?<!\\\\)\$' . $this->_dvar_guts_regexp . '\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
+ if(preg_match_all('~(?:\`(?<!\\\\)\$' . $this->_dvar_guts_regexp . '(?:' . $this->_obj_ext_regexp . ')*\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
$_match = $_match[0];
rsort($_match);
reset($_match);
--
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php