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

- fixed directory separator handling

Browse Source
This commit is contained in:
Uwe.Tews
2009-05-14 10:53:28 +00:00
parent bd6b49ee1e
commit 1084678645
7 changed files with 544 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,3 +1,6 @@
05/14/2009
- fixed directory separator handling
05/09/2009 05/09/2009
- syntax change for stream variables - syntax change for stream variables
- fixed bug when using absolute template filepath and caching - fixed bug when using absolute template filepath and caching

2
libs/Smarty.class.php
View File

@@ -449,7 +449,7 @@ class Smarty extends Smarty_Internal_TemplateBase {
} }
// loop through plugin dirs and find the plugin // loop through plugin dirs and find the plugin
foreach((array)$this->plugins_dir as $_plugin_dir) { foreach((array)$this->plugins_dir as $_plugin_dir) {
if (substr($_plugin_dir, -1) != DIRECTORY_SEPARATOR) { if (strpos('/\\',substr($_plugin_dir, -1)) === false) {
$_plugin_dir .= DIRECTORY_SEPARATOR; $_plugin_dir .= DIRECTORY_SEPARATOR;
} }

2
libs/sysplugins/internal.cacheresource_file.php
View File

@@ -165,7 +165,7 @@ class Smarty_Internal_CacheResource_File extends Smarty_Internal_PluginBase {
$_compile_id = ''; $_compile_id = '';
} }
$_cache_dir = $this->smarty->cache_dir; $_cache_dir = $this->smarty->cache_dir;
if (substr($_cache_dir, -1) != DIRECTORY_SEPARATOR) { if (strpos('/\\',substr($_cache_dir, -1)) === false) {
$_cache_dir .= DIRECTORY_SEPARATOR; $_cache_dir .= DIRECTORY_SEPARATOR;
} }

2
libs/sysplugins/internal.config.php
View File

@@ -77,7 +77,7 @@ class Smarty_Internal_Config extends Smarty_Internal_Base {
public function buildConfigFilepath () public function buildConfigFilepath ()
{ {
foreach((array)$this->smarty->config_dir as $_config_dir) { foreach((array)$this->smarty->config_dir as $_config_dir) {
if (substr($_config_dir, -1) != DIRECTORY_SEPARATOR) { if (strpos('/\\',substr($_config_dir, -1)) === false) {
$_config_dir .= DIRECTORY_SEPARATOR; $_config_dir .= DIRECTORY_SEPARATOR;
} }

2
libs/sysplugins/internal.resource_file.php
View File

@@ -111,7 +111,7 @@ class Smarty_Internal_Resource_File extends Smarty_Internal_Base {
$_cache = ''; $_cache = '';
} }
$_compile_dir = $_template->smarty->compile_dir; $_compile_dir = $_template->smarty->compile_dir;
if (substr($_compile_dir, -1) != DIRECTORY_SEPARATOR) { if (strpos('/\\',substr($_compile_dir, -1)) === false) {
$_compile_dir .= DIRECTORY_SEPARATOR; $_compile_dir .= DIRECTORY_SEPARATOR;
} }
return $_compile_dir . $_filepath . '.' . basename($_template->resource_name) . $_cache . $_template->smarty->php_ext; return $_compile_dir . $_filepath . '.' . basename($_template->resource_name) . $_cache . $_template->smarty->php_ext;

2
libs/sysplugins/internal.template.php
View File

@@ -591,7 +591,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase {
$file = $this->resource_name; $file = $this->resource_name;
} }
foreach((array)$this->smarty->template_dir as $_template_dir) { foreach((array)$this->smarty->template_dir as $_template_dir) {
if (substr($_template_dir, -1) != DIRECTORY_SEPARATOR) { if (strpos('/\\',substr($_template_dir, -1)) === false) {
$_template_dir .= DIRECTORY_SEPARATOR; $_template_dir .= DIRECTORY_SEPARATOR;
} }

1071
libs/sysplugins/internal.templateparser.php
View File

File diff suppressed because it is too large Load Diff