From 42332895284edcbc17068577b34f8087b23dd0bf Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 22 Feb 2012 16:01:18 +0000 Subject: [PATCH] // Fixed AdminController : existence of default_value was not accurate git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13536 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/AdminController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index af381a4e1..902d46bbe 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1697,7 +1697,7 @@ class AdminControllerCore extends Controller 'current' => self::$currentIndex, 'token' => $this->token, )); - + $this->context->smarty->assign('submit_form_ajax', (int)Tools::getValue('submitFormAjax')); $this->initProcess(); @@ -2072,9 +2072,9 @@ class AdminControllerCore extends Controller $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']])) + if (isset($input['default_value']) && is_array($input['default_value']) && isset($input['default_value'][$language['id_lang']])) $fieldValue = $input['default_value'][$language['id_lang']]; - else + else if (isset($input['default_value'])) $fieldValue = $input['default_value']; } $this->fields_value[$input['name']][$language['id_lang']] = $fieldValue;