dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir)

Browse Source
This commit is contained in:
Damien Metzger
2012-12-28 09:47:09 +01:00
parent 321eaa191b
commit 7bebdb5eb5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+1 -2
View File
@@ -669,8 +669,7 @@ class ToolsCore
public static function deleteDirectory($dirname, $delete_self = true) public static function deleteDirectory($dirname, $delete_self = true)
{ {
$dirname = rtrim($dirname, '/').'/'; $dirname = rtrim($dirname, '/').'/';
$files = scandir($dirname); if ($files = scandir($dirname))
if (is_dir($dirname))
{ {
foreach ($files as $file) foreach ($files as $file)
if ($file != '.' && $file != '..' && $file != '.svn') if ($file != '.' && $file != '..' && $file != '.svn')
controllers/admin/AdminTranslationsController.php
+1 -2
View File
@@ -655,9 +655,8 @@ class AdminTranslationsControllerCore extends AdminController
elseif (!preg_match('@^[0-9a-z-_/\\\\]+\.(html|tpl|txt)$@i', $file2check['filename'])) elseif (!preg_match('@^[0-9a-z-_/\\\\]+\.(html|tpl|txt)$@i', $file2check['filename']))
$this->errors[] = sprintf(Tools::displayError('Unidentified file found: %s'), $file2check['filename']); $this->errors[] = sprintf(Tools::displayError('Unidentified file found: %s'), $file2check['filename']);
} }
Tools::deleteDirectory($sandbox, true);
} }
Tools::deleteDirectory($sandbox, true);
if (count($this->errors)) if (count($this->errors))
return false; return false;