diff --git a/classes/Language.php b/classes/Language.php index 976b4ec79..0963279bb 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -541,15 +541,17 @@ class LanguageCore extends ObjectModel $modList = scandir(_PS_MODULE_DIR_); foreach ($modList as $mod) { Language::recurseDeleteDir(_PS_MODULE_DIR_.$mod.'/mails/'.$this->iso_code); - $files = @scandir(_PS_MODULE_DIR_.$mod.'/mails/'); - if (count($files) <= 2) { + if (($files = @scandir(_PS_MODULE_DIR_.$mod.'/mails/')) + && (count($files) <= 2) + ) { Language::recurseDeleteDir(_PS_MODULE_DIR_.$mod.'/mails/'); } if (file_exists(_PS_MODULE_DIR_.$mod.'/'.$this->iso_code.'.php')) { unlink(_PS_MODULE_DIR_.$mod.'/'.$this->iso_code.'.php'); - $files = @scandir(_PS_MODULE_DIR_.$mod); - if (count($files) <= 2) { + if (($files = @scandir(_PS_MODULE_DIR_.$mod)) + && (count($files) <= 2) + ) { Language::recurseDeleteDir(_PS_MODULE_DIR_.$mod); } }