// Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780

admin-dev/ajax.php

@@ -79,8 +79,6 @@ if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity'))
 	$jsonArray = array();
 	$import = new AdminImportController();
 
-	$languages = Language::getLanguages(false);
-	$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
 	$fields = $import->getAvailableFields(true);
 	foreach ($fields AS $field)
 		$jsonArray[] = '{"field":"'.addslashes($field).'"}';

admin-dev/themes/default/template/controllers/cart_rules/form.tpl

@@ -54,6 +54,6 @@
 			name: '{$language.name|escape:'quotes'}'
 		};
 	{/foreach}
-	displayFlags(languages, {$defaultLanguage});
+	displayFlags(languages, {$id_lang_default});
 </script>
 <script type="text/javascript" src="themes/default/template/controllers/cart_rules/form.js"></script>

admin-dev/themes/default/template/controllers/cart_rules/informations.tpl

@@ -5,7 +5,7 @@
 			<div class="margin-form">
 				<div class="translatable">
 				{foreach from=$languages item=language}
-					<div class="lang_{$language.id_lang|intval}" style="display:{if $language.id_lang == $defaultLanguage}block{else}none{/if};float:left">
+					<div class="lang_{$language.id_lang|intval}" style="display:{if $language.id_lang == $id_lang_default}block{else}none{/if};float:left">
 						<input type="text" id="name_{$language.id_lang|intval}" name="name_{$language.id_lang|intval}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang|intval)}" style="width:400px" />
 						<sup>*</sup>
 					</div>

admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl

@@ -83,7 +83,7 @@
 	<script type="text/javascript">
 		var token = '{$token}';
 		var id_product = {if isset($product->id)}{$product->id}{else}0{/if};
-		var defaultLanguage = {$defaultLanguage};
+		var id_lang_default = {$id_lang_default};
 		var product_type_pack = {Product::PTYPE_PACK};
 		var product_type_virtual = {Product::PTYPE_VIRTUAL};
 		var product_type_simple = {Product::PTYPE_SIMPLE};

controllers/admin/AdminCartRulesController.php

@@ -549,7 +549,7 @@ class AdminCartRulesControllerCore extends AdminController
 				'gift_product_attribute_select' => $gift_product_attribute_select,
 				'reductionProductFilter' => $reduction_product_filter,
 				'defaultCurrency' => Configuration::get('PS_CURRENCY_DEFAULT'),
-				'defaultLanguage' => Configuration::get('PS_LANG_DEFAULT'),
+				'id_lang_default' => Configuration::get('PS_LANG_DEFAULT'),
 				'languages' => $languages,
 				'currencies' => $currencies,
 				'countries' => $countries,

controllers/admin/AdminProductsController.php

@@ -2318,7 +2318,7 @@ class AdminProductsControllerCore extends AdminController
 
 		$this->getLanguages();
 
-		$this->tpl_form_vars['defaultLanguage'] = Configuration::get('PS_LANG_DEFAULT');
+		$this->tpl_form_vars['id_lang_default'] = Configuration::get('PS_LANG_DEFAULT');
 
 		$this->tpl_form_vars['currentIndex'] = self::$currentIndex;
 		$this->tpl_form_vars['display_multishop_checkboxes'] = (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP && $this->display == 'edit');

js/admin-products.js

@@ -419,12 +419,12 @@ function handleSaveButtons(e)
 
 	// common for all products
 	$("#disableSaveMessage").remove();
-	if ($("#name_"+defaultLanguage).val() == "" && (!display_multishop_checkboxes || $('input[name=\'multishop_check[name]['+defaultLanguage+']\']').prop('checked')))
+	if ($("#name_" + id_lang_default).val() == "" && (!display_multishop_checkboxes || $('input[name=\'multishop_check[name][' + id_lang_default + ']\']').prop('checked')))
 	{
 		msg[i++] = empty_name_msg;
 	}
 	// check friendly_url_[defaultlangid] only if name is ok
-	else if ($("#link_rewrite_"+defaultLanguage).val() == "" && (!display_multishop_checkboxes || $('input[name=\'link_rewrite[name]['+defaultLanguage+']\']').prop('checked')))
+	else if ($("#link_rewrite_" + id_lang_default).val() == "" && (!display_multishop_checkboxes || $('input[name=\'link_rewrite[name][' + id_lang_default + ']\']').prop('checked')))
 		msg[i++] = empty_link_rewrite_msg;
 
 	if (msg.length == 0)
@@ -1577,7 +1577,7 @@ $(document).ready(function() {
 
 	updateCurrentText();
 
-	$("#name_"+defaultLanguage+",#link_rewrite_"+defaultLanguage)
+	$("#name_" + id_lang_default + ",#link_rewrite_" + id_lang_default)
 		.live("change", function(e)
 		{
 			if(typeof e == KeyboardEvent)
@@ -1586,7 +1586,7 @@ $(document).ready(function() {
 			$(this).trigger("handleSaveButtons");
 		});
 	// bind that custom event
-	$("#name_"+defaultLanguage+",#link_rewrite_"+defaultLanguage)
+	$("#name_" + id_lang_default + ",#link_rewrite_" + id_lang_default)
 		.live("handleSaveButtons", function(e)
 		{
 			handleSaveButtons()

modules/blockcustomerprivacy/blockcustomerprivacy.php

@@ -59,7 +59,7 @@ class Blockcustomerprivacy extends Module
 	
 	public function getContent()
 	{
-		$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
+		$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
 		$languages = Language::getLanguages(false);
 		$iso = $this->context->language->iso_code;
 
@@ -87,7 +87,7 @@ class Blockcustomerprivacy extends Module
 			</script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce.inc.js"></script>
-			<script language="javascript" type="text/javascript">id_language = Number('.$defaultLanguage.');</script>';
+			<script language="javascript" type="text/javascript">id_language = Number('.$id_lang_default.');</script>';
 		else
 		{
 			$content .= '
@@ -119,7 +119,7 @@ class Blockcustomerprivacy extends Module
 					convert_urls : false,
 					language : "'.(file_exists(_PS_ROOT_DIR_.'/js/tinymce/jscripts/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en').'"
 				});
-				id_language = Number('.$defaultLanguage.');
+				id_language = Number('.$id_lang_default.');
 			</script>';
 		}
 		
@@ -132,10 +132,10 @@ class Blockcustomerprivacy extends Module
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$content .= '					
-					<div id="ccont_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">
+					<div id="ccont_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').';float: left;">
 						<textarea class="rte" cols="70" rows="30" id="custpriv_message_'.$language['id_lang'].'" name="custpriv_message_'.$language['id_lang'].'">'.(isset($values[$language['id_lang']]) ? $values[$language['id_lang']] : '').'</textarea>
 					</div>';		
-		$content .= $this->displayFlags($languages, $defaultLanguage, 'ccont', 'ccont', true).'
+		$content .= $this->displayFlags($languages, $id_lang_default, 'ccont', 'ccont', true).'
 					<div class="clear">
 				</div>
 					<p>

modules/blocklink/blocklink.php

@@ -149,7 +149,7 @@ class BlockLink extends Module
 	{
 		if (!($languages = Language::getLanguages()))
 			 return false;
-		$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
+		$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
 
 		if ($id_link = Tools::getValue('id_link'))
 		{
@@ -165,7 +165,7 @@ class BlockLink extends Module
 						return false;
 		 	 	}
 				else
-					if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.$language['id_lang'].', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')'))
+					if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.$language['id_lang'].', \''.pSQL($_POST['text_'.$id_lang_default]).'\')'))
 						return false;
 		}
 		else
@@ -183,7 +183,7 @@ class BlockLink extends Module
 						return false;
 				}
 				else
-					if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$defaultLanguage]).'\')'))
+					if (!Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'blocklink_lang VALUES ('.(int)$id_link.', '.(int)($language['id_lang']).', \''.pSQL($_POST['text_'.$id_lang_default]).'\')'))
 						return false;
 		}
 
@@ -289,7 +289,7 @@ class BlockLink extends Module
 	private function _displayForm()
 	{
 	 	/* Language */
-		$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
+		$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
 		$languages = Language::getLanguages(false);
 		$divLangName = 'text¤title';
 		/* Title */
@@ -314,7 +314,7 @@ class BlockLink extends Module
 		}
 		$this->_html .= '
 		<script type="text/javascript">
-			id_language = Number('.$defaultLanguage.');
+			id_language = Number('.$id_lang_default.');
 		</script>
 		<fieldset>
 			<legend><img src="'.$this->_path.'add.png" alt="" title="" /> '.$this->l('Add a new link').'</legend>
@@ -324,10 +324,10 @@ class BlockLink extends Module
 				<div class="margin-form">';
 			foreach ($languages as $language)
 				$this->_html .= '
-					<div id="text_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
+					<div id="text_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
 						<input type="text" name="text_'.$language['id_lang'].'" id="textInput_'.$language['id_lang'].'" value="'.((isset($links) && isset($links['text'][$language['id_lang']])) ? $links['text'][$language['id_lang']] : '').'" /><sup> *</sup>
 					</div>';
-			$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'text', true);
+			$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'text', true);
 			$this->_html .= '
 					<div class="clear"></div>
 				</div>
@@ -358,10 +358,10 @@ class BlockLink extends Module
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$this->_html .= '
-					<div id="title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
+					<div id="title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
 						<input type="text" name="title_'.$language['id_lang'].'" value="'.Tools::safeOutput(($this->error && isset($_POST['title'])) ? $_POST['title'] : Configuration::get('PS_BLOCKLINK_TITLE', $language['id_lang'])).'" /><sup> *</sup>
 					</div>';
-		$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'title', true);
+		$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'title', true);
 		$this->_html .= '
 				<div class="clear"></div>
 				</div>

modules/homeslider/homeslider.php

@@ -309,10 +309,10 @@ class HomeSlider extends Module
 			$this->adminDisplayWarning(sprintf($this->l('modules %s must be writable (CHMOD 755 / 777)'), $this->name));
 
 		/* Gets languages and sets which div requires translations */
-		$defaultLanguage = (int)Configuration::get('PS_LANG_DEFAULT');
+		$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
 		$languages = Language::getLanguages(false);
 		$divLangName = 'image¤title¤url¤legend¤description';
-		$this->_html .= '<script type="text/javascript">id_language = Number('.$defaultLanguage.');</script>';
+		$this->_html .= '<script type="text/javascript">id_language = Number('.$id_lang_default.');</script>';
 
 		/* Form */
 		$this->_html .= '<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">';
@@ -326,7 +326,7 @@ class HomeSlider extends Module
 		$this->_html .= '<label>'.$this->l('Select a file:').' * </label><div class="margin-form">';
 		foreach ($languages as $language)
 		{
-			$this->_html .= '<div id="image_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">';
+			$this->_html .= '<div id="image_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').';float: left;">';
 			$this->_html .= '<input type="file" name="image_'.$language['id_lang'].'" id="image_'.$language['id_lang'].'" size="30" value="'.(isset($slide->image[$language['id_lang']]) ? $slide->image[$language['id_lang']] : '').'"/>';
 			/* Sets image as hidden in case it does not change */
 			if ($slide && $slide->image[$language['id_lang']])
@@ -336,7 +336,7 @@ class HomeSlider extends Module
 				$this->_html .= '<img src="'.__PS_BASE_URI__.'modules/'.$this->name.'/images/'.$slide->image[$language['id_lang']].'" width="'.(Configuration::get('HOMESLIDER_WIDTH')/2).'" height="'.(Configuration::get('HOMESLIDER_HEIGHT')/2).'" alt=""/>';
 			$this->_html .= '</div>';
 		}
-		$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'image', true);
+		$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'image', true);
 		/* End Fieldset Upload */
 		$this->_html .= '</fieldset><br /><br />';
 
@@ -358,11 +358,11 @@ class HomeSlider extends Module
 		foreach ($languages as $language)
 		{
 			$this->_html .= '
-					<div id="title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">
+					<div id="title_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').';float: left;">
 						<input type="text" name="title_'.$language['id_lang'].'" id="title_'.$language['id_lang'].'" size="30" value="'.(isset($slide->title[$language['id_lang']]) ? $slide->title[$language['id_lang']] : '').'"/>
 					</div>';
 		}
-		$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'title', true);
+		$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'title', true);
 		$this->_html .= '</div><br /><br />';
 
 		/* URL */
@@ -370,11 +370,11 @@ class HomeSlider extends Module
 		foreach ($languages as $language)
 		{
 			$this->_html .= '
-					<div id="url_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">
+					<div id="url_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').';float: left;">
 						<input type="text" name="url_'.$language['id_lang'].'" id="url_'.$language['id_lang'].'" size="30" value="'.(isset($slide->url[$language['id_lang']]) ? $slide->url[$language['id_lang']] : '').'"/>
 					</div>';
 		}
-		$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'url', true);
+		$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'url', true);
 		$this->_html .= '</div><br /><br />';
 
 		/* Legend */
@@ -382,11 +382,11 @@ class HomeSlider extends Module
 		foreach ($languages as $language)
 		{
 			$this->_html .= '
-					<div id="legend_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">
+					<div id="legend_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').';float: left;">
 						<input type="text" name="legend_'.$language['id_lang'].'" id="legend_'.$language['id_lang'].'" size="30" value="'.(isset($slide->legend[$language['id_lang']]) ? $slide->legend[$language['id_lang']] : '').'"/>
 					</div>';
 		}
-		$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'legend', true);
+		$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'legend', true);
 		$this->_html .= '</div><br /><br />';
 
 		/* Description */
@@ -395,11 +395,11 @@ class HomeSlider extends Module
 		<div class="margin-form">';
 		foreach ($languages as $language)
 		{
-			$this->_html .= '<div id="description_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">
+			$this->_html .= '<div id="description_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').';float: left;">
 				<textarea name="description_'.$language['id_lang'].'" rows="10" cols="29">'.(isset($slide->description[$language['id_lang']]) ? $slide->description[$language['id_lang']] : '').'</textarea>
 			</div>';
 		}
-		$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'description', true);
+		$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'description', true);
 		$this->_html .= '</div><div class="clear"></div><br />';
 
 		/* Active */
@@ -481,16 +481,16 @@ class HomeSlider extends Module
 			}
 
 			/* Checks title/url/legend/description for default lang */
-			$defaultLanguage = (int)Configuration::get('PS_LANG_DEFAULT');
-			if (strlen(Tools::getValue('title_'.$defaultLanguage)) == 0)
+			$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
+			if (strlen(Tools::getValue('title_'.$id_lang_default)) == 0)
 				$errors[] = $this->l('Title is not set');
-			if (strlen(Tools::getValue('legend_'.$defaultLanguage)) == 0)
+			if (strlen(Tools::getValue('legend_'.$id_lang_default)) == 0)
 				$errors[] = $this->l('Legend is not set');
-			if (strlen(Tools::getValue('url_'.$defaultLanguage)) == 0)
+			if (strlen(Tools::getValue('url_'.$id_lang_default)) == 0)
 				$errors[] = $this->l('URL is not set');
-			if (!isset($_FILES['image_'.$defaultLanguage]) || empty($_FILES['image_'.$defaultLanguage]['tmp_name']))
+			if (!isset($_FILES['image_'.$id_lang_default]) || empty($_FILES['image_'.$id_lang_default]['tmp_name']))
 				$errors[] = $this->l('Image is not set');
-			if (Tools::getValue('image_old_'.$defaultLanguage) && !Validate::isFileName(Tools::getValue('image_old_'.$defaultLanguage)))
+			if (Tools::getValue('image_old_'.$id_lang_default) && !Validate::isFileName(Tools::getValue('image_old_'.$id_lang_default)))
 				$errors[] = $this->l('Image is not set');
 		} /* Validation for deletion */
 		elseif (Tools::isSubmit('delete_id_slide') && (!Validate::isInt(Tools::getValue('delete_id_slide')) || !$this->slideExists((int)Tools::getValue('delete_id_slide'))))

modules/loyalty/loyalty.php

@@ -169,7 +169,7 @@ class Loyalty extends Module
 	{
 		if (Tools::isSubmit('submitLoyalty'))
 		{
-			$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
+			$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
 			$languages = Language::getLanguages();
 			
 			$this->_errors = array();
@@ -196,28 +196,28 @@ class Loyalty extends Module
 					$this->loyaltyStateConvert->name[(int)($language['id_lang'])] = Tools::getValue('convert_loyalty_state_'.(int)($language['id_lang']));
 					$this->loyaltyStateNoneAward->name[(int)($language['id_lang'])] = Tools::getValue('none_award_loyalty_state_'.(int)($language['id_lang']));
 				}
-				if (empty($arrayVoucherDetails[$defaultLanguage]))
-					$arrayVoucherDetails[$defaultLanguage] = ' ';
+				if (empty($arrayVoucherDetails[$id_lang_default]))
+					$arrayVoucherDetails[$id_lang_default] = ' ';
 				Configuration::updateValue('PS_LOYALTY_VOUCHER_DETAILS', $arrayVoucherDetails);
 			
-				if (empty($this->loyaltyStateDefault->name[$defaultLanguage]))
-					$this->loyaltyStateDefault->name[$defaultLanguage] = ' ';
+				if (empty($this->loyaltyStateDefault->name[$id_lang_default]))
+					$this->loyaltyStateDefault->name[$id_lang_default] = ' ';
 				$this->loyaltyStateDefault->save();
 			
-				if (empty($this->loyaltyStateValidation->name[$defaultLanguage]))
-					$this->loyaltyStateValidation->name[$defaultLanguage] = ' ';
+				if (empty($this->loyaltyStateValidation->name[$id_lang_default]))
+					$this->loyaltyStateValidation->name[$id_lang_default] = ' ';
 				$this->loyaltyStateValidation->save();
 			
-				if (empty($this->loyaltyStateCancel->name[$defaultLanguage]))
-					$this->loyaltyStateCancel->name[$defaultLanguage] = ' ';
+				if (empty($this->loyaltyStateCancel->name[$id_lang_default]))
+					$this->loyaltyStateCancel->name[$id_lang_default] = ' ';
 				$this->loyaltyStateCancel->save();
 			
-				if (empty($this->loyaltyStateConvert->name[$defaultLanguage]))
-					$this->loyaltyStateConvert->name[$defaultLanguage] = ' ';
+				if (empty($this->loyaltyStateConvert->name[$id_lang_default]))
+					$this->loyaltyStateConvert->name[$id_lang_default] = ' ';
 				$this->loyaltyStateConvert->save();
 			
-				if (empty($this->loyaltyStateNoneAward->name[$defaultLanguage]))
-					$this->loyaltyStateNoneAward->name[$defaultLanguage] = ' ';
+				if (empty($this->loyaltyStateNoneAward->name[$id_lang_default]))
+					$this->loyaltyStateNoneAward->name[$id_lang_default] = ' ';
 				$this->loyaltyStateNoneAward->save();
 
 				echo $this->displayConfirmation($this->l('Settings updated.'));
@@ -249,13 +249,13 @@ class Loyalty extends Module
 
 		$order_states = OrderState::getOrderStates($this->context->language->id);
 		$currency = new Currency((int)(Configuration::get('PS_CURRENCY_DEFAULT')));
-		$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
+		$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
 		$languages = Language::getLanguages(false);
 		$languageIds = 'voucher_details¤default_loyalty_state¤none_award_loyalty_state¤convert_loyalty_state¤validation_loyalty_state¤cancel_loyalty_state';
 
 		$html = '
 		<script type="text/javascript">
-			id_language = Number('.$defaultLanguage.');
+			id_language = Number('.$id_lang_default.');
 		</script>
 		<h2>'.$this->l('Loyalty Program').'</h2>
 		<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post">
@@ -276,10 +276,10 @@ class Loyalty extends Module
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$html .= '
-					<div id="voucher_details_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
+					<div id="voucher_details_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
 						<input size="33" type="text" name="voucher_details_'.$language['id_lang'].'" value="'.Configuration::get('PS_LOYALTY_VOUCHER_DETAILS', (int)($language['id_lang'])).'" />
 					</div>';
-		$html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'voucher_details', true);
+		$html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'voucher_details', true);
 		$html .= '	</div>
 				<div class="clear" style="margin-top: 20px"></div>
 				<label>'.$this->l('Minimum amount in which the voucher can be used').'</label>
@@ -335,50 +335,50 @@ class Loyalty extends Module
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$html .= '
-					<div id="default_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
-						<input size="33" type="text" name="default_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateDefault->name[(int)($language['id_lang'])]) ? $this->loyaltyStateDefault->name[(int)($language['id_lang'])] : $this->loyaltyStateDefault->name[(int)$defaultLanguage]).'" />
+					<div id="default_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
+						<input size="33" type="text" name="default_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateDefault->name[(int)($language['id_lang'])]) ? $this->loyaltyStateDefault->name[(int)($language['id_lang'])] : $this->loyaltyStateDefault->name[(int)$id_lang_default]).'" />
 					</div>';
-		$html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'default_loyalty_state', true);
+		$html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'default_loyalty_state', true);
 		$html .= '	</div>
 				<div class="clear"></div>
 				<label>'.$this->l('Unavailable').'</label>
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$html .= '
-					<div id="none_award_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
-						<input size="33" type="text" name="none_award_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateNoneAward->name[(int)($language['id_lang'])]) ? $this->loyaltyStateNoneAward->name[(int)($language['id_lang'])] : $this->loyaltyStateNoneAward->name[(int)$defaultLanguage]).'" />
+					<div id="none_award_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
+						<input size="33" type="text" name="none_award_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateNoneAward->name[(int)($language['id_lang'])]) ? $this->loyaltyStateNoneAward->name[(int)($language['id_lang'])] : $this->loyaltyStateNoneAward->name[(int)$id_lang_default]).'" />
 					</div>';
-		$html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'none_award_loyalty_state', true);
+		$html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'none_award_loyalty_state', true);
 		$html .= '	</div>
 				<div class="clear"></div>
 				<label>'.$this->l('Converted').'</label>
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$html .= '
-					<div id="convert_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
-						<input size="33" type="text" name="convert_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateConvert->name[(int)($language['id_lang'])]) ? $this->loyaltyStateConvert->name[(int)($language['id_lang'])] : $this->loyaltyStateConvert->name[(int)$defaultLanguage]).'" />
+					<div id="convert_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
+						<input size="33" type="text" name="convert_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateConvert->name[(int)($language['id_lang'])]) ? $this->loyaltyStateConvert->name[(int)($language['id_lang'])] : $this->loyaltyStateConvert->name[(int)$id_lang_default]).'" />
 					</div>';
-		$html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'convert_loyalty_state', true);
+		$html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'convert_loyalty_state', true);
 		$html .= '	</div>
 				<div class="clear"></div>
 				<label>'.$this->l('Validation').'</label>
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$html .= '
-					<div id="validation_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
-						<input size="33" type="text" name="validation_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateValidation->name[(int)($language['id_lang'])]) ? $this->loyaltyStateValidation->name[(int)($language['id_lang'])] : $this->loyaltyStateValidation->name[(int)$defaultLanguage]).'" />
+					<div id="validation_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
+						<input size="33" type="text" name="validation_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateValidation->name[(int)($language['id_lang'])]) ? $this->loyaltyStateValidation->name[(int)($language['id_lang'])] : $this->loyaltyStateValidation->name[(int)$id_lang_default]).'" />
 					</div>';
-		$html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'validation_loyalty_state', true);
+		$html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'validation_loyalty_state', true);
 		$html .= '	</div>
 				<div class="clear"></div>
 				<label>'.$this->l('Cancelled').'</label>
 				<div class="margin-form">';
 		foreach ($languages as $language)
 			$html .= '
-					<div id="cancel_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left;">
-						<input size="33" type="text" name="cancel_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateCancel->name[(int)($language['id_lang'])]) ? $this->loyaltyStateCancel->name[(int)($language['id_lang'])] : $this->loyaltyStateCancel->name[(int)$defaultLanguage]).'" />
+					<div id="cancel_loyalty_state_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left;">
+						<input size="33" type="text" name="cancel_loyalty_state_'.$language['id_lang'].'" value="'.(isset($this->loyaltyStateCancel->name[(int)($language['id_lang'])]) ? $this->loyaltyStateCancel->name[(int)($language['id_lang'])] : $this->loyaltyStateCancel->name[(int)$id_lang_default]).'" />
 					</div>';
-		$html .= $this->displayFlags($languages, $defaultLanguage, $languageIds, 'cancel_loyalty_state', true);
+		$html .= $this->displayFlags($languages, $id_lang_default, $languageIds, 'cancel_loyalty_state', true);
 		$html .= '	</div>
 				<div class="clear center">
 					<input type="submit" style="margin-top:20px" name="submitLoyalty" id="submitLoyalty" value="'.$this->l('   Save   ').'" class="button" />

modules/referralprogram/referralprogram.php

@@ -290,15 +290,15 @@ class ReferralProgram extends Module
 		</table>
 			<p>
 				 <div style="float: left"><label class="t" for="discount_description">'.$this->l('Voucher description:').'</label></div>';
-			$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
+			$id_lang_default = (int)Configuration::get('PS_LANG_DEFAULT');
 			$languages = Language::getLanguages(true);
 
 			foreach ($languages AS $language)
 				$this->_html .= '
-				<div id="dd_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').'; float: left; margin-left: 4px;">
+				<div id="dd_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $id_lang_default ? 'block' : 'none').'; float: left; margin-left: 4px;">
 					<input type="text" name="discount_description['.$language['id_lang'].']" id="discount_description['.$language['id_lang'].']" value="'.(isset($_POST['discount_description'][(int)($language['id_lang'])]) ? $_POST['discount_description'][(int)($language['id_lang'])] : $this->_configuration['REFERRAL_DISCOUNT_DESCRIPTION'][(int)($language['id_lang'])]).'" style="width: 200px;" />
 				</div>';
-			$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'dd', true);
+			$this->_html .= $this->displayFlags($languages, $id_lang_default, $divLangName, 'dd', true);
 			$this->_html .= '
 			</p>
 			<div class="clear center"><input class="button" style="margin-top: 10px" name="submitReferralProgram" id="submitReferralProgram" value="'.$this->l('Update settings').'" type="submit" /></div>
@@ -309,7 +309,6 @@ class ReferralProgram extends Module
 	private function _displayFormRules()
 	{
 		// Languages preliminaries
-		$defaultLanguage = $this->context->language->id;
 		$languages = Language::getLanguages();
 		$iso = $this->context->language->iso_code;
 		$divLangName = 'cpara¤dd';
@@ -331,18 +330,18 @@ class ReferralProgram extends Module
 			</script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce.inc.js"></script>
-			<script language="javascript" type="text/javascript">id_language = Number('.$defaultLanguage.');</script>
+			<script language="javascript" type="text/javascript">id_language = Number('.$this->context->language->id.');</script>
 		<form method="post" action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" enctype="multipart/form-data">
 			<fieldset>
 				<legend><img src="'.$this->_path.'logo.gif" alt="" title="" /> '.$this->l('Conditions of the referral program').'</legend>';
 		foreach ($languages AS $language)
 		{
 			$this->_html .= '
-			<div id="cpara_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $defaultLanguage ? 'block' : 'none').';float: left;">
+			<div id="cpara_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->context->language->id ? 'block' : 'none').';float: left;">
 				<textarea class="rte" cols="120" rows="25" id="body_paragraph_'.$language['id_lang'].'" name="body_paragraph_'.$language['id_lang'].'">'.($xml ? stripslashes(htmlspecialchars($xml->body->{'paragraph_'.$language['id_lang']})) : '').'</textarea>
 			</div>';
 		}
-		$this->_html .= $this->displayFlags($languages, $defaultLanguage, $divLangName, 'cpara', true);
+		$this->_html .= $this->displayFlags($languages, $this->context->language->id, $divLangName, 'cpara', true);
 
 		$this->_html .= '
 				<div class="clear center"><input type="submit" name="submitText" value="'.$this->l('Update text').'" class="button" style="margin-top: 10px" /></div>