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

do not clone Smarty object on internal createTemplate() calls

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2010-12-22 16:35:39 +00:00
parent c0b6f29077
commit 9f3758ace1
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,5 +1,8 @@
===== SVN trunk ===== ===== SVN trunk =====
22/12/2010
- update do not clone the Smarty object an internal createTemplate() calls to increase performance
21/12/2010 21/12/2010
- update html_options to support class and id attrs - update html_options to support class and id attrs

15
libs/Smarty.class.php
View File

@@ -317,7 +317,7 @@ class Smarty extends Smarty_Internal_Data {
} }
// create template object if necessary // create template object if necessary
($template instanceof $this->template_class)? $_template = $template : ($template instanceof $this->template_class)? $_template = $template :
$_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent); $_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent, false);
if (isset($this->error_reporting)) { if (isset($this->error_reporting)) {
$_smarty_old_error_level = error_reporting($this->error_reporting); $_smarty_old_error_level = error_reporting($this->error_reporting);
} }
@@ -396,7 +396,7 @@ class Smarty extends Smarty_Internal_Data {
$parent = $this; $parent = $this;
} }
if (!($template instanceof $this->template_class)) { if (!($template instanceof $this->template_class)) {
$template = $this->createTemplate ($template, $cache_id, $compile_id, $parent); $template = $this->createTemplate ($template, $cache_id, $compile_id, $parent, false);
} }
// return cache status of template // return cache status of template
return $template->isCached(); return $template->isCached();
@@ -417,12 +417,13 @@ class Smarty extends Smarty_Internal_Data {
* creates a template object * creates a template object
* *
* @param string $template the resource handle of the template file * @param string $template the resource handle of the template file
* @param object $parent next higher level of Smarty variables
* @param mixed $cache_id cache id to be used with this template * @param mixed $cache_id cache id to be used with this template
* @param mixed $compile_id compile id to be used with this template * @param mixed $compile_id compile id to be used with this template
* @param object $parent next higher level of Smarty variables
* @param boolean $do_clone flag is Smarty object shall be cloned
* @returns object template object * @returns object template object
*/ */
public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null) public function createTemplate($template, $cache_id = null, $compile_id = null, $parent = null, $do_clone = true)
{ {
if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) { if (!empty($cache_id) && (is_object($cache_id) || is_array($cache_id))) {
$parent = $cache_id; $parent = $cache_id;
@@ -443,7 +444,11 @@ class Smarty extends Smarty_Internal_Data {
$tpl = $this->template_objects[$_templateId]; $tpl = $this->template_objects[$_templateId];
} else { } else {
// create new template object // create new template object
$tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id); if ($do_clone) {
$tpl = new $this->template_class($template, clone $this, $parent, $cache_id, $compile_id);
} else {
$tpl = new $this->template_class($template, $this, $parent, $cache_id, $compile_id);
}
} }
} else { } else {
// just return a copy of template class // just return a copy of template class