From 85da11181d7d2a78a944135b9e6b6ca7192a3c63 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Sun, 30 Jun 2013 19:42:07 +0200 Subject: [PATCH] //remove warning --- classes/Tools.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index 39027ed14..3af0fb428 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -677,19 +677,20 @@ class ToolsCore public static function deleteDirectory($dirname, $delete_self = true) { $dirname = rtrim($dirname, '/').'/'; - if ($files = scandir($dirname)) - { - foreach ($files as $file) - if ($file != '.' && $file != '..' && $file != '.svn') + if (file_exists($dirname)) + if ($files = scandir($dirname)) { - if (is_dir($dirname.$file)) - Tools::deleteDirectory($dirname.$file, true); - elseif (file_exists($dirname.$file)) - unlink($dirname.$file); + foreach ($files as $file) + if ($file != '.' && $file != '..' && $file != '.svn') + { + if (is_dir($dirname.$file)) + Tools::deleteDirectory($dirname.$file, true); + elseif (file_exists($dirname.$file)) + unlink($dirname.$file); + } + if ($delete_self) + rmdir($dirname); } - if ($delete_self) - rmdir($dirname); - } } /**