// Fixed language code consistency

classes/Language.php

@@ -691,6 +691,7 @@ class LanguageCore extends ObjectModel
 		// Initialize the language
 		$lang = new Language();
 		$lang->iso_code = $iso_code;
+		$lang->language_code = $iso_code;
 		$lang->active = true;
 
 		// If the language pack has not been provided, retrieve it from prestashop.com
@@ -700,13 +701,15 @@ class LanguageCore extends ObjectModel
 		// If a language pack has been found or provided, prefill the language object with the value
 		if ($lang_pack)
 			foreach (get_object_vars($lang_pack) as $key => $value)
-				$lang->$key = $value;
+				if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+					$lang->$key = $value;
 
 		// Use the values given in parameters to override the data retrieved automatically
 		if ($params_lang !== null && is_array($params_lang))
 			foreach ($params_lang as $key => $value)
-				$lang->$key = $value;
-		
+				if ($key != 'iso_code' && isset(Language::$definition['fields'][$key]))
+					$lang->$key = $value;
+
 		if (!$lang->add(true, false, $only_add))
 			return false;
 
@@ -724,7 +727,7 @@ class LanguageCore extends ObjectModel
 		}
 		else
 			Language::_copyNoneFlag((int)$lang->id);
-	
+
 		$files_copy = array(
 			'/en.jpg',
 			'/en-default-'.ImageType::getFormatedName('thickbox').'.jpg',
@@ -734,7 +737,7 @@ class LanguageCore extends ObjectModel
 			'/en-default-'.ImageType::getFormatedName('small').'.jpg',
 			'/en-default-'.ImageType::getFormatedName('scene').'.jpg'
 		);
-		
+
 		foreach (array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_) as $to)
 			foreach ($files_copy as $file)
 				@copy(dirname(__FILE__).'/../img/l'.$file, $to.str_replace('/en', '/'.$iso_code, $file));