Skip to content
Browse files

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

…to release
  • Loading branch information...
2 parents ef46d41 + 1dde9b6 commit d10bf0620ab495ca6de0ea96ead3252f947115b5 @vAugagneur vAugagneur committed
Showing with 1 addition and 2 deletions.
  1. +1 −2 classes/Tools.php
View
3 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')

0 comments on commit d10bf06

Please sign in to comment.
Something went wrong with that request. Please try again.