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

- bugfix apostrophe in plugins_dir path name failed (forum topic 20199)

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-10-21 12:08:35 +00:00
parent 6470e6a2c9
commit 37719ce858
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
21.10.2011
- bugfix apostrope in plugins_dir path name failed (forum topic 20199)
20.10.2011 20.10.2011
- @silenced unlink() in Smarty_Internal_Write_File since debuggers go haywire without it. - @silenced unlink() in Smarty_Internal_Write_File since debuggers go haywire without it.
- bugfix Smarty::clearCompiledTemplate() threw an Exception if $cache_id was not present in $compile_dir when $use_sub_dirs = true. - bugfix Smarty::clearCompiledTemplate() threw an Exception if $cache_id was not present in $compile_dir when $use_sub_dirs = true.

10
libs/sysplugins/smarty_internal_template.php
View File

@@ -334,7 +334,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
$plugins_string = '<?php '; $plugins_string = '<?php ';
foreach ($this->required_plugins['compiled'] as $tmp) { foreach ($this->required_plugins['compiled'] as $tmp) {
foreach ($tmp as $data) { foreach ($tmp as $data) {
$plugins_string .= "if (!is_callable('{$data['function']}')) include '{$data['file']}';\n"; $file = addslashes($data['file']);
$plugins_string .= "if (!is_callable('{$data['function']}')) include '{$file}';\n";
} }
} }
$plugins_string .= '?>'; $plugins_string .= '?>';
@@ -344,7 +345,8 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
$plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; "; $plugins_string .= "<?php echo '/*%%SmartyNocache:{$this->properties['nocache_hash']}%%*/<?php \$_smarty = \$_smarty_tpl->smarty; ";
foreach ($this->required_plugins['nocache'] as $tmp) { foreach ($this->required_plugins['nocache'] as $tmp) {
foreach ($tmp as $data) { foreach ($tmp as $data) {
$plugins_string .= "if (!is_callable(\'{$data['function']}\')) include \'{$data['file']}\';\n"; $file = addslashes($data['file']);
$plugins_string .= addslashes("if (!is_callable('{$data['function']}')) include '{$file}';\n");
} }
} }
$plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n"; $plugins_string .= "?>/*/%%SmartyNocache:{$this->properties['nocache_hash']}%%*/';?>\n";
@@ -564,7 +566,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
{ {
throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\""); throw new SmartyException("Not matching {capture} open/close in \"{$this->template_resource}\"");
} }
/** /**
* Empty cache for this template * Empty cache for this template
* *
@@ -576,7 +578,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
Smarty_CacheResource::invalidLoadedCache($this->smarty); Smarty_CacheResource::invalidLoadedCache($this->smarty);
return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time); return $this->cached->handler->clear($this->smarty, $this->template_name, $this->cache_id, $this->compile_id, $exp_time);
} }
/** /**
* set Smarty property in template context * set Smarty property in template context
* *