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

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
vAugagneur
2012-12-28 10:23:52 +01:00
parent 289a203bce 7bebdb5eb5
commit a5568e8196
1 changed files with 1 additions and 2 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')