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

2012-12-28 10:23:52 +01:00
parent 289a203bce 7bebdb5eb5
commit a5568e8196
1 changed files with 1 additions and 2 deletions
@@ -669,8 +669,7 @@ class ToolsCore
 	public static function deleteDirectory($dirname, $delete_self = true)
 	{
 		$dirname = rtrim($dirname, '/').'/';
-		$files = scandir($dirname);
-		if (is_dir($dirname))
+		if ($files = scandir($dirname))
 		{
 			foreach ($files as $file)
 			if ($file != '.' && $file != '..' && $file != '.svn')