// Fix bug on HelperOption
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9496 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -118,7 +118,7 @@
|
|||||||
echo '</table>';
|
echo '</table>';
|
||||||
*}
|
*}
|
||||||
{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang'}
|
{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang'}
|
||||||
{if if $field['type'] == 'textLang'}
|
{if $field['type'] == 'textLang'}
|
||||||
{foreach $field['languages'] AS $id_lang => $value}
|
{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;">
|
<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}" />
|
<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}_{$id_lang}" value="{$value}" />
|
||||||
|
|||||||
@@ -52,6 +52,8 @@ class HelperOptionsCore extends Helper
|
|||||||
public function generateOptions($option_list)
|
public function generateOptions($option_list)
|
||||||
{
|
{
|
||||||
$tab = Tab::getTab($this->context->language->id, $this->id);
|
$tab = Tab::getTab($this->context->language->id, $this->id);
|
||||||
|
if (!isset($languages))
|
||||||
|
$languages = Language::getLanguages(false);
|
||||||
foreach ($option_list as $category => $category_data)
|
foreach ($option_list as $category => $category_data)
|
||||||
{
|
{
|
||||||
if (!isset($category_data['image']))
|
if (!isset($category_data['image']))
|
||||||
@@ -90,8 +92,6 @@ class HelperOptionsCore extends Helper
|
|||||||
// Fill values for all languages for all lang fields
|
// Fill values for all languages for all lang fields
|
||||||
if (substr($field['type'], -4) == 'Lang')
|
if (substr($field['type'], -4) == 'Lang')
|
||||||
{
|
{
|
||||||
if (!isset($languages))
|
|
||||||
$languages = Language::getLanguages(false);
|
|
||||||
|
|
||||||
foreach ($languages as $language)
|
foreach ($languages as $language)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user