From e8b54ff8faf5c4c833c6c7a22938a29c22cc4578 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 21 May 2012 07:23:31 +0000 Subject: [PATCH] //small check git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15471 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Tools.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index c90151a08..42022413a 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -634,7 +634,9 @@ class ToolsCore { $dirname = rtrim($dirname, '/').'/'; $files = scandir($dirname); - foreach ($files as $file) + if (is_dir($dirname)) + { + foreach ($files as $file) if ($file != '.' && $file != '..' && $file != '.svn') { if (is_dir($dirname.$file)) @@ -642,8 +644,10 @@ class ToolsCore elseif (file_exists($dirname.$file)) unlink($dirname.$file); } - if ($delete_self) - rmdir($dirname); + if ($delete_self) + rmdir($dirname); + } + } /**