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

add $smarty.config.foo var, handle embedded smarty var correctly

Browse Source
This commit is contained in:
mohrt
2003-02-24 14:51:47 +00:00
parent 52f15b67b2
commit 3e755114a3
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -1,3 +1,6 @@
- handle embedded "$smarty.config.foo.tpl" correctly (Monte)
- add $smarty.config.varname variable for accessing config vars (Paul
Lockaby, Monte)
- silence PHP warnings in function.fetch.php (Eduardo, - silence PHP warnings in function.fetch.php (Eduardo,
Monte) Monte)
- added get_config_vars(), same basic functionality as - added get_config_vars(), same basic functionality as

10
libs/Smarty_Compiler.class.php
View File

@@ -1446,7 +1446,7 @@ class Smarty_Compiler extends Smarty {
function _expand_quoted_text($var_expr) function _expand_quoted_text($var_expr)
{ {
// if contains unescaped $, expand it // if contains unescaped $, expand it
if(preg_match_all('%(?<!\\\\)\$(?:smarty(?:\.\w+)+|\w+(?:' . $this->_var_bracket_regexp . ')*)%', $var_expr, $match)) { if(preg_match_all('%(?<!\\\\)\$(?:smarty(?:\.\w+){1,2}|\w+(?:' . $this->_var_bracket_regexp . ')*)%', $var_expr, $match)) {
rsort($match[0]); rsort($match[0]);
reset($match[0]); reset($match[0]);
foreach($match[0] as $var) { foreach($match[0] as $var) {
@@ -1770,6 +1770,14 @@ class Smarty_Compiler extends Smarty {
$compiled_ref = '(defined("' . substr($indexes[0],1) . '") ? ' . substr($indexes[0],1) . ' : null)'; $compiled_ref = '(defined("' . substr($indexes[0],1) . '") ? ' . substr($indexes[0],1) . ' : null)';
break; break;
case 'config':
array_shift($indexes);
$name = substr($indexes[0], 1);
$compiled_ref = "\$this->_config[0]['vars']";
if ($name = substr($indexes[0], 1))
$compiled_ref .= "['$name']";
break;
default: default:
$this->_syntax_error('$smarty.' . $ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__); $this->_syntax_error('$smarty.' . $ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
break; break;