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

- code cleanup

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2010-11-13 17:48:30 +00:00
parent 7dc5c0a09d
commit 5d278ce5ad
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,6 +1,7 @@
13/11/2010 13/11/2010
- bugfix overloading problem when $smarty->fetch()/display() have been used in plugins - bugfix overloading problem when $smarty->fetch()/display() have been used in plugins
(introduced with 3.0.2) (introduced with 3.0.2)
- code cleanup
===== Smarty 3.0.3 ===== ===== Smarty 3.0.3 =====

10
libs/Smarty.class.php
View File

@@ -564,19 +564,15 @@ class Smarty extends Smarty_Internal_Data {
if (!isset($type)) { if (!isset($type)) {
$type = $this->caching_type; $type = $this->caching_type;
} }
// already loaded?
if (isset($this->cache_resource_objects[$type])) {
return $this->cache_resource_objects[$type];
}
if (in_array($type, $this->cache_resource_types)) { if (in_array($type, $this->cache_resource_types)) {
$cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type); $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
return $this->cache_resource_objects[$type] = new $cache_resource_class($this); return new $cache_resource_class($this);
} }
else { else {
// try plugins dir // try plugins dir
$cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type); $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
if (Smarty_Internal_Plugin_Loader::loadPlugin($cache_resource_class, $this->plugins_dir)) { if ($this->loadPlugin($cache_resource_class)) {
return $this->cache_resource_objects[$type] = new $cache_resource_class($this); return new $cache_resource_class($this);
} }
else { else {
throw new SmartyException("Unable to load cache resource '{$type}'"); throw new SmartyException("Unable to load cache resource '{$type}'");

2
libs/sysplugins/smarty_internal_debug.php
View File

@@ -93,7 +93,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data {
$rdelim = $smarty->right_delimiter; $rdelim = $smarty->right_delimiter;
$smarty->left_delimiter = '{'; $smarty->left_delimiter = '{';
$smarty->right_delimiter = '}'; $smarty->right_delimiter = '}';
$_template = new Smarty_Template ($smarty->debug_tpl, $smarty); $_template = new Smarty_Internal_Template ($smarty->debug_tpl, $smarty);
$_template->caching = false; $_template->caching = false;
$_template->force_compile = false; $_template->force_compile = false;
$_template->disableSecurity(); $_template->disableSecurity();

18
libs/sysplugins/smarty_internal_template.php
View File

@@ -95,7 +95,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
// Template resource // Template resource
$this->template_resource = $template_resource; $this->template_resource = $template_resource;
// copy block data of template inheritance // copy block data of template inheritance
if ($this->parent instanceof Smarty_Template or $this->parent instanceof Smarty_Internal_Template) { if ($this->parent instanceof Smarty_Internal_Template) {
$this->block_data = $this->parent->block_data; $this->block_data = $this->parent->block_data;
} }
@@ -455,7 +455,7 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
if (!$this->resource_object->isEvaluated && empty($this->properties['file_dependency'][$this->templateUid])) { if (!$this->resource_object->isEvaluated && empty($this->properties['file_dependency'][$this->templateUid])) {
$this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type); $this->properties['file_dependency'][$this->templateUid] = array($this->getTemplateFilepath(), $this->getTemplateTimestamp(),$this->resource_type);
} }
if ($this->parent instanceof Smarty_Template or $this->parent instanceof Smarty_Internal_Template) { if ($this->parent instanceof Smarty_Internal_Template) {
$this->parent->properties['file_dependency'] = array_merge($this->parent->properties['file_dependency'], $this->properties['file_dependency']); $this->parent->properties['file_dependency'] = array_merge($this->parent->properties['file_dependency'], $this->properties['file_dependency']);
foreach($this->required_plugins as $code => $tmp1) { foreach($this->required_plugins as $code => $tmp1) {
foreach($tmp1 as $name => $tmp) { foreach($tmp1 as $name => $tmp) {
@@ -859,7 +859,10 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
if ($template == null) { if ($template == null) {
return $this->smarty->fetch($this); return $this->smarty->fetch($this);
} else { } else {
return $this->smarty->fetch($template, $cache_id, $compile_id, $parent, $display); if (!isset($parent)) {
$parent = $this;
}
return $this->smarty->fetch($template, $cache_id, $compile_id, $parent, $display);
} }
} }
@@ -872,6 +875,9 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
if ($template == null) { if ($template == null) {
return $this->smarty->display($this); return $this->smarty->display($this);
} else { } else {
if (!isset($parent)) {
$parent = $this;
}
return $this->smarty->display($template, $cache_id, $compile_id, $parent); return $this->smarty->display($template, $cache_id, $compile_id, $parent);
} }
@@ -953,10 +959,4 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
} }
} }
/**
* wrapper for template class
*/
class Smarty_Template extends Smarty_Internal_Template {
}
?> ?>