From c5e65e1360f1fa0838bddbdbc3d519ceac51b99c Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 26 Jun 2013 11:38:08 +0200 Subject: [PATCH] [-] BO - fixed bug #PSCFV-9435 - AdminController - processUpdateOptions does not manage required field correctly in a non-mutltishop context --- classes/controller/AdminController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 98546450d..597e75371 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -955,7 +955,8 @@ class AdminControllerCore extends Controller continue; // Check if field is required - if (isset($values['required']) && $values['required'] && !empty($_POST['multishopOverrideOption'][$field])) + if ((!Shop::isFeatureActive() && isset($values['required']) && $values['required']) + || (Shop::isFeatureActive() && isset($_POST['multishopOverrideOption'][$field]) && isset($values['required']) && $values['required'])) if (isset($values['type']) && $values['type'] == 'textLang') { foreach ($languages as $language)