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

- added scope to Smarty variables in the {block} tag compiler

Browse Source
This commit is contained in:
Uwe.Tews
2009-11-12 21:32:46 +00:00
parent 55b2d90fb8
commit f149804f3e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,5 +1,6 @@
11/12/2009 11/12/2009
- fixed variable filenames in {include_php} and {insert} - fixed variable filenames in {include_php} and {insert}
- added scope to Smarty variables in the {block} tag compiler
11/11/2009 11/11/2009
- fixed {foreachelse}, {forelse}, {sectionelse} compiled code at nocache variables - fixed {foreachelse}, {forelse}, {sectionelse} compiled code at nocache variables

6
libs/sysplugins/smarty_internal_compile_extend.php
View File

@@ -43,20 +43,20 @@ class Smarty_Internal_Compile_Extend extends Smarty_Internal_CompileBase {
for ($i = 0; $i < $block_count; $i++) { for ($i = 0; $i < $block_count; $i++) {
$block_content = str_replace($this->smarty->left_delimiter . '$smarty.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', $block_content = str_replace($this->smarty->left_delimiter . '$smarty.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
substr($_old_source, $s[0][$i][1] + strlen($s[0][$i][0]), $c[0][$i][1] - $s[0][$i][1] - strlen($s[0][$i][0]))); substr($_old_source, $s[0][$i][1] + strlen($s[0][$i][0]), $c[0][$i][1] - $s[0][$i][1] - strlen($s[0][$i][0])));
$this->saveBlockData($block_content, $s[0][$i][0]); $this->saveBlockData($block_content, $s[0][$i][0],$compiler->template);
} }
$compiler->template->template_source = $_template->getTemplateSource(); $compiler->template->template_source = $_template->getTemplateSource();
$compiler->abort_and_recompile = true; $compiler->abort_and_recompile = true;
return ' '; return ' ';
} }
protected function saveBlockData($block_content, $block_tag) protected function saveBlockData($block_content, $block_tag,$template)
{ {
if (0 == preg_match('/(.?)(name=)([^ ]*)/', $block_tag, $_match)) { if (0 == preg_match('/(.?)(name=)([^ ]*)/', $block_tag, $_match)) {
$this->compiler->trigger_template_error("\"" . $block_tag . "\" missing name attribute"); $this->compiler->trigger_template_error("\"" . $block_tag . "\" missing name attribute");
} else { } else {
// compile block content // compile block content
$_tpl = $this->smarty->createTemplate('string:' . $block_content); $_tpl = $this->smarty->createTemplate('string:' . $block_content,null,null,$template);
$_tpl->template_filepath = $this->compiler->template->getTemplateFilepath(); $_tpl->template_filepath = $this->compiler->template->getTemplateFilepath();
// $_tpl->suppressFileDependency = true; // $_tpl->suppressFileDependency = true;
$_compiled_content = $_tpl->getCompiledTemplate(); $_compiled_content = $_tpl->getCompiledTemplate();

6
libs/sysplugins/smarty_internal_resource_extend.php
View File

@@ -95,7 +95,7 @@ class Smarty_Internal_Resource_Extend {
for ($_i = 0; $_i < $_block_count; $_i++) { for ($_i = 0; $_i < $_block_count; $_i++) {
$_block_content = str_replace($this->smarty->left_delimiter . '$smarty.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', $_block_content = str_replace($this->smarty->left_delimiter . '$smarty.parent' . $this->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%',
substr($_content, $_open[0][$_i][1] + strlen($_open[0][$_i][0]), $_close[0][$_i][1] - $_open[0][$_i][1] - strlen($_open[0][$_i][0]))); substr($_content, $_open[0][$_i][1] + strlen($_open[0][$_i][0]), $_close[0][$_i][1] - $_open[0][$_i][1] - strlen($_open[0][$_i][0])));
$this->saveBlockData($_block_content, $_open[0][$_i][0]); $this->saveBlockData($_block_content, $_open[0][$_i][0],$this->template);
} }
} else { } else {
$template->template_source = $_content; $template->template_source = $_content;
@@ -103,13 +103,13 @@ class Smarty_Internal_Resource_Extend {
} }
} }
} }
protected function saveBlockData($block_content, $block_tag) protected function saveBlockData($block_content, $block_tag,$template)
{ {
if (0 == preg_match('/(.?)(name=)([^ ]*)/', $block_tag, $_match)) { if (0 == preg_match('/(.?)(name=)([^ ]*)/', $block_tag, $_match)) {
$this->smarty->trigger_error("\"" . $block_tag . "\" missing name attribute"); $this->smarty->trigger_error("\"" . $block_tag . "\" missing name attribute");
} else { } else {
// compile block content // compile block content
$_tpl = $this->smarty->createTemplate('string:' . $block_content); $_tpl = $this->smarty->createTemplate('string:' . $block_content,null,null,$template);
$_tpl->template_filepath = $this->template->getTemplateFilepath(); $_tpl->template_filepath = $this->template->getTemplateFilepath();
// $_tpl->suppressFileDependency = true; // $_tpl->suppressFileDependency = true;
$_compiled_content = $_tpl->getCompiledTemplate(); $_compiled_content = $_tpl->getCompiledTemplate();