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

- bugfix force default debug.tpl to be loaded by the file resource when default_resource_type was modified

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-02-19 00:20:45 +00:00
parent 5b8a7e2ad9
commit dea3e1f83e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,6 +1,7 @@
===== SVN trunk ===== ===== SVN trunk =====
18/02/2011 18/02/2011
- bugfix removed possible race condition when isCached() was called for an individually cached subtemplate - bugfix removed possible race condition when isCached() was called for an individually cached subtemplate
- bugfix force default debug.tpl to be loaded by the file resource when default_resource_type was modified
17/02/2011 17/02/2011
-improvement not to delete files starting with '.' from cache and template_c folders on clearCompiledTemplate() and clearCache() -improvement not to delete files starting with '.' from cache and template_c folders on clearCompiledTemplate() and clearCache()

2
libs/Smarty.class.php
View File

@@ -258,7 +258,7 @@ class Smarty extends Smarty_Internal_Data {
$this->plugins_dir = array(SMARTY_PLUGINS_DIR); $this->plugins_dir = array(SMARTY_PLUGINS_DIR);
$this->cache_dir = '.' . DS . 'cache' . DS; $this->cache_dir = '.' . DS . 'cache' . DS;
$this->config_dir = '.' . DS . 'configs' . DS; $this->config_dir = '.' . DS . 'configs' . DS;
$this->debug_tpl = SMARTY_DIR . 'debug.tpl'; $this->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl';
if (isset($_SERVER['SCRIPT_NAME'])) { if (isset($_SERVER['SCRIPT_NAME'])) {
$this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']); $this->assignGlobal('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
} }

2
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -307,7 +307,7 @@ class Smarty_Internal_TemplateCompilerBase {
} else { } else {
if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) { if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) {
$function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function']; $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function'];
} else if (isset($this->template->required_plugins['compiled'][$plugin_name][$type])) { } else if (isset($this->template->required_plugins['nocache'][$plugin_name][$type])) {
$this->template->required_plugins['compiled'][$plugin_name][$type] = $this->template->required_plugins['nocache'][$plugin_name][$type]; $this->template->required_plugins['compiled'][$plugin_name][$type] = $this->template->required_plugins['nocache'][$plugin_name][$type];
$function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function']; $function = $this->template->required_plugins['compiled'][$plugin_name][$type]['function'];
} }