mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-06 19:34:27 +02:00
- fixed problems with doublequoted strings at name attribute of {block} tag
- bugfix at scope attribute of {append} tag
This commit is contained in:
@@ -1,3 +1,7 @@
|
||||
08/09/2009
|
||||
- fixed problems with doublequoted strings at name attribute of {block} tag
|
||||
- bugfix at scope attribute of {append} tag
|
||||
|
||||
08/08/2009
|
||||
- removed all internal calls of Smarty::instance()
|
||||
- fixed code in double quoted strings
|
||||
|
@@ -41,7 +41,13 @@ class Smarty_Internal_Compile_Append extends Smarty_Internal_CompileBase {
|
||||
$_attr = $this->_get_attributes($args);
|
||||
|
||||
if (isset($_attr['scope'])) {
|
||||
$_scope = trim($_attr['scope'],'\'');
|
||||
if ($_attr['scope'] == '\'parent\'') {
|
||||
$_scope = SMARTY_PARENT_SCOPE;
|
||||
} elseif ($_attr['scope'] == '\'root\'') {
|
||||
$_scope = SMARTY_ROOT_SCOPE;
|
||||
} elseif ($_attr['scope'] == '\'global\'') {
|
||||
$_scope = SMARTY_GLOBAL_SCOPE;
|
||||
}
|
||||
}
|
||||
// compiled output
|
||||
if (isset($_attr['index'])) {
|
||||
|
@@ -33,7 +33,7 @@ class Smarty_Internal_Compile_BlockClose extends Smarty_Internal_CompileBase {
|
||||
if (isset($_attr['name']) && $saved_data[0]['name'] != $_attr['name']) {
|
||||
$this->compiler->trigger_template_error('mismatching name attributes "' . $saved_data[0]['name'] . '" and "' . $_attr['name'] . '"');
|
||||
}
|
||||
$_name = trim($saved_data[0]['name'], "'");
|
||||
$_name = trim($saved_data[0]['name'], "\"'");
|
||||
if (isset($compiler->template->block_data[$_name])) {
|
||||
if ($compiler->template->block_data[$_name]['mode'] == 'prepend') {
|
||||
$_output = $compiler->template->block_data[$_name]['compiled'] . $compiler->template->extracted_compiled_code;
|
||||
|
Reference in New Issue
Block a user