dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Removing attribute 'preselect_country' and use 'default_value' instead

Browse Source
This commit is contained in:
mDeflotte
2012-02-22 14:27:32 +00:00
parent 735842b766
commit 07ebf2e2e5
9 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
classes/controller/AdminController.php
View File

@@ -2068,9 +2068,24 @@ class AdminControllerCore extends Controller
}
else if (isset($input['lang']) && $input['lang'])
foreach ($this->_languages as $language)
$this->fields_value[$input['name']][$language['id_lang']] = $this->getFieldValue($obj, $input['name'], $language['id_lang']);
{
$fieldValue = $this->getFieldValue($obj, $input['name'], $language['id_lang']);
if (empty($fieldValue))
{
if (is_array($input['default_value']) && isset($input['default_value'][$language['id_lang']]))
$fieldValue = $input['default_value'][$language['id_lang']];
else
$fieldValue = $input['default_value'];
}
$this->fields_value[$input['name']][$language['id_lang']] = $fieldValue;
}
else
$this->fields_value[$input['name']] = $this->getFieldValue($obj, $input['name']);
{
$fieldValue = $this->getFieldValue($obj, $input['name']);
if (empty($fieldValue) && isset($input['default_value']))
$fieldValue = $input['default_value'];
$this->fields_value[$input['name']] = $fieldValue;
}
return $this->fields_value;
}