From 30a914b14884aee879bcb322e085ce3656ab74ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 27 Aug 2013 15:41:00 +0200 Subject: [PATCH] // typo --- controllers/admin/AdminLanguagesController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index 2112d1fbe..233b3e7dd 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -104,7 +104,8 @@ class AdminLanguagesControllerCore extends AdminController $this->addRowAction('delete'); $this->displayWarning($this->l('When you delete a language, all related translations in the database will be deleted.')); - $this->displayInformation($this->l('Your .htaccess file must be writable.')); + if (!is_writable(_PS_ROOT_DIR_.'/.htaccess') && Configuration::get('PS_REWRITING_SETTINGS')) + $this->displayInformation($this->l('Your .htaccess file must be writable.')); return parent::renderList(); } @@ -374,12 +375,11 @@ class AdminLanguagesControllerCore extends AdminController if ($_FILES['no-picture']['error'] == UPLOAD_ERR_OK) $this->copyNoPictureImage(strtolower(Tools::getValue('iso_code'))); unset($_FILES['no-picture']); - return parent::processAdd(); } else $this->errors[] = Tools::displayError('Flag and "No picture" image fields are required.'); - return false; + return parent::processAdd(); } public function processUpdate()