//remove warning

This commit is contained in:
gRoussac committed 2013-06-30 19:42:07 +02:00
1 parent d583cf25d2
commit 85da11181d
1 file changed
+12 -11
+12 -11
View File
@@ -677,19 +677,20 @@ class ToolsCore
public static function deleteDirectory($dirname, $delete_self = true) public static function deleteDirectory($dirname, $delete_self = true)
{ {
$dirname = rtrim($dirname, '/').'/'; $dirname = rtrim($dirname, '/').'/';
if ($files = scandir($dirname)) if (file_exists($dirname))
{ if ($files = scandir($dirname))
foreach ($files as $file)
if ($file != '.' && $file != '..' && $file != '.svn')
{ {
if (is_dir($dirname.$file)) foreach ($files as $file)
Tools::deleteDirectory($dirname.$file, true); if ($file != '.' && $file != '..' && $file != '.svn')
elseif (file_exists($dirname.$file)) {
unlink($dirname.$file); 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);
}
} }
/** /**