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

…to release
PrestaShop · Dec 28, 2012 · d10bf06 · d10bf06
2 parents ef46d41 + 1dde9b6
commit d10bf06
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/classes/Tools.php b/classes/Tools.php
@@ -669,8 +669,7 @@ public static function safePostVars()
 	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')