From e855e49dfb1b345189da28f5a66e2a669ad167bc Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 17 Nov 2011 15:21:36 +0000 Subject: [PATCH] //fixed small bug git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10219 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/AdminController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/AdminController.php b/classes/AdminController.php index a5ed1a3fc..390e77aee 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -794,11 +794,11 @@ class AdminControllerCore extends Controller if (!Tools::getValue($field) && isset($values['default'])) $_POST[$field] = $values['default']; - if (1 || !count($this->_errors)) + if (!count($this->_errors)) { foreach ($fields as $key => $options) { - if (isset($options['visibility']) && $options['visibility'] > Context::getContext()->shop->getContextType()) + if (Shop::isFeatureActive() && isset($options['visibility']) && ($options['visibility'] > Context::getContext()->shop->getContextType())) continue; if (Shop::isFeatureActive() && isset($_POST['configUseDefault'][$key])) @@ -840,6 +840,7 @@ class AdminControllerCore extends Controller } } } + //d('after '); } } if (count($this->_errors) <= 0)