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

fixed $smarty->debugging on merged compiled subtemplates

Browse Source
This commit is contained in:
Uwe Tews
2014-11-08 21:02:14 +01:00
parent 8f8d462b8a
commit f92af96419
1 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libs/sysplugins/smarty_internal_template.php
View File

@@ -237,15 +237,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
$this->properties['cache_lifetime'] = $this->cache_lifetime; $this->properties['cache_lifetime'] = $this->cache_lifetime;
$this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true)); $this->properties['unifunc'] = 'content_' . str_replace(array('.', ','), '_', uniqid('', true));
$content = $this->createTemplateCodeFrame($content, true); $content = $this->createTemplateCodeFrame($content, true);
/** @var Smarty_Internal_Template $_smarty_tpl
* used in evaluated code
*/
/**
* $_smarty_tpl = $this;
* eval("?>" . $content);
* $this->cached->valid = true;
* $this->cached->processed = true;
*/
return $this->cached->write($this, $content); return $this->cached->write($this, $content);
} }
@@ -306,7 +297,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
$tpl->tpl_vars[$_key] = new Smarty_variable($_val); $tpl->tpl_vars[$_key] = new Smarty_variable($_val);
} }
} }
return $tpl->fetch(null, null, null, null, false, false, true); return $tpl->fetch(null, null, null, null, false, false, true);
} }
@@ -371,17 +361,20 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
public function getInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash, $content_func) public function getInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash, $content_func)
{ {
$tpl = $this->setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash); $tpl = $this->setupInlineSubTemplate($template, $cache_id, $compile_id, $caching, $cache_lifetime, $data, $parent_scope, $hash);
if ($this->debugging) {
if ($this->smarty->debugging) {
Smarty_Internal_Debug::start_template($tpl); Smarty_Internal_Debug::start_template($tpl);
Smarty_Internal_Debug::start_render($tpl); Smarty_Internal_Debug::start_render($tpl);
} }
ob_start(); ob_start();
$content_func($tpl); $content_func($tpl);
if ($this->debugging) { if ($this->smarty->debugging) {
Smarty_Internal_Debug::end_template($tpl); Smarty_Internal_Debug::end_template($tpl);
Smarty_Internal_Debug::end_render($tpl); Smarty_Internal_Debug::end_render($tpl);
} }
if (!empty($tpl->properties['file_dependency'])) {
$this->properties['file_dependency'] = array_merge($this->properties['file_dependency'], $tpl->properties['file_dependency']);
}
return str_replace($tpl->properties['nocache_hash'], $this->properties['nocache_hash'], ob_get_clean()); return str_replace($tpl->properties['nocache_hash'], $this->properties['nocache_hash'], ob_get_clean());
} }
@@ -490,25 +483,6 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
if (!$this->source->recompiled) { if (!$this->source->recompiled) {
$output .= "<?php }} ?>\n"; $output .= "<?php }} ?>\n";
} }
if ($cache && isset($this->properties['tpl_function']['param'])) {
$requiredFunctions = array();
foreach ($this->properties['tpl_function']['param'] as $name => $param) {
if (isset($this->properties['tpl_function']['to_cache'][$name])) {
$requiredFunctions[$param['compiled_filepath']][$name] = $param;
}
}
foreach ($requiredFunctions as $filepath => $functions) {
$code = file_get_contents($filepath);
foreach ($functions as $name => $param) {
if (preg_match("/\/\* {$param['call_name']} \*\/([\S\s]*?)\/\*\/ {$param['call_name']} \*\//", $code, $match)) {
$output .= "<?php \n";
$output .= $match[0];
$output .= "?>\n";
}
}
unset($code, $match);
}
}
return $output; return $output;
} }