From 98f60d039bd6198a1ab21b08bdc03cb8b0e88034 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Tue, 3 Sep 2013 12:29:17 +0200 Subject: [PATCH] // fix warning --- classes/Language.php | 3 ++- controllers/admin/AdminTranslationsController.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/Language.php b/classes/Language.php index 724cbbb9b..786ed75a6 100644 --- a/classes/Language.php +++ b/classes/Language.php @@ -460,7 +460,8 @@ class LanguageCore extends ObjectModel } closedir($handle); } - rmdir($dir); + if (is_writable($dir)) + rmdir($dir); } public function delete() diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 3bbb11dc0..9766e356b 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -460,7 +460,9 @@ class AdminTranslationsControllerCore extends AdminController if (!$default_language || !Validate::isLanguageIsoCode($default_language)) return false; // 1 - Scan mails files - $mails = scandir(_PS_MAIL_DIR_.$default_language.'/'); + $mails = array(); + if (Tools::file_exists_cache(_PS_MAIL_DIR_.$default_language.'/')) + $mails = scandir(_PS_MAIL_DIR_.$default_language.'/'); $mails_new_lang = array();