- bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive

at wrong path permissions because realpath() fail (forum 25397)
This commit is contained in:
Uwe Tews
2015-01-21 22:14:25 +01:00
parent 85f24ce413
commit 8d5fa36a80
3 changed files with 6 additions and 6 deletions

View File

@@ -1,7 +1,7 @@
 ===== 3.1.22-dev ===== (xx.xx.2015)
20.01.2015
- bugfix clearCompiledTemplates() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397)
21.01.2015
- bugfix clearCompiledTemplates(), clearAll() and clear() could try to delete whole drive at wrong path permissions because realpath() fail (forum 25397)
04.01.2015
- push last weeks changes to github

View File

@@ -163,10 +163,10 @@ class Smarty_Internal_CacheResource_File extends Smarty_CacheResource
$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
$_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
$_compile_id_offset = $smarty->use_sub_dirs ? 3 : 0;
if (($_dir = realpath($smarty->getCacheDir())) === false) {
$_dir = realpath($smarty->getCacheDir()) . '/';
if ($_dir == '/') { //We should never want to delete this!
return 0;
}
$_dir .= '/';
$_dir_length = strlen($_dir);
if (isset($_cache_id)) {
$_cache_id_parts = explode('|', $_cache_id);

View File

@@ -191,10 +191,10 @@ class Smarty_Internal_Utility
*/
public static function clearCompiledTemplate($resource_name, $compile_id, $exp_time, Smarty $smarty)
{
if (($_compile_dir = realpath($smarty->getCompileDir())) === false) {
$_compile_dir = realpath($smarty->getCompileDir()) . '/';
if ($_compile_dir == '/') { //We should never want to delete this!
return 0;
}
$_compile_dir .= '/';
$_compile_id = isset($compile_id) ? preg_replace('![^\w\|]+!', '_', $compile_id) : null;
$_dir_sep = $smarty->use_sub_dirs ? '/' : '^';
if (isset($resource_name)) {