From e39c4c2304d709e607976ac13fcec1fbccac7652 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Thu, 20 Oct 2011 12:13:14 +0000
Subject: [PATCH] // Fix bug on HelperOption

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9496 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/options.tpl | 2 +-
 classes/HelperOptions.php             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/template/options.tpl b/admin-dev/themes/template/options.tpl
index 4883ad9c1..06011d08c 100644
--- a/admin-dev/themes/template/options.tpl
+++ b/admin-dev/themes/template/options.tpl
@@ -118,7 +118,7 @@
 					echo '</table>';
 			*}
 				{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang'}
-					{if if $field['type'] == 'textLang'}
+					{if $field['type'] == 'textLang'}
 						{foreach $field['languages'] AS $id_lang => $value}
 							<div id="{$key}_{$id_lang}" style="margin-bottom:8px; display: {if $id_lang == $current_id_lang}'block'{else}'none'{/if}; float: left; vertical-align: top;">
 								<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}_{$id_lang}" value="{$value}" />
diff --git a/classes/HelperOptions.php b/classes/HelperOptions.php
index a4e50c67c..04b0e2c76 100644
--- a/classes/HelperOptions.php
+++ b/classes/HelperOptions.php
@@ -52,6 +52,8 @@ class HelperOptionsCore extends Helper
 	public function generateOptions($option_list)
 	{
 		$tab = Tab::getTab($this->context->language->id, $this->id);
+		if (!isset($languages))
+			$languages = Language::getLanguages(false);
 		foreach ($option_list as $category => $category_data)
 		{
 			if (!isset($category_data['image']))
@@ -90,8 +92,6 @@ class HelperOptionsCore extends Helper
 				// Fill values for all languages for all lang fields
 				if (substr($field['type'], -4) == 'Lang')
 				{
-					if (!isset($languages))
-						$languages = Language::getLanguages(false);
 
 					foreach ($languages as $language)
 					{
@@ -218,4 +218,4 @@ class HelperOptionsCore extends Helper
 
 		return false;
 	}
-}
\ No newline at end of file
+}