From 598469e41e1af9384c49f1a867c6ab2d1176a935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 27 Aug 2013 15:38:29 +0200
Subject: [PATCH] // typo debug

---
 classes/Language.php                           | 2 +-
 controllers/admin/AdminLanguagesController.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/Language.php b/classes/Language.php
index 2b99b3d74..724cbbb9b 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -519,7 +519,7 @@ class LanguageCore extends ObjectModel
 				'-default-'.ImageType::getFormatedName('medium').'.jpg',
 				'-default-'.ImageType::getFormatedName('small').'.jpg'
 			);
-			$image_directories = array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_);
+			$images_directories = array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_);
 			foreach ($images_directories as $image_directory)
 				foreach ($images as $image)
 				{
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()