From e5ec07f95ab561c8e51b9552c0158b2b43374050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Tue, 4 Dec 2012 11:13:06 +0100 Subject: [PATCH] [-] BO: Add display of modules errors on reset #PSCFV-2077 --- controllers/admin/AdminModulesController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 400c5176c..354d01a04 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -462,6 +462,7 @@ class AdminModulesControllerCore extends AdminController } else $this->errors[] = Tools::displayError('Cannot load module object'); + $this->errors = array_merge($this->errors, $module->getErrors()); } else $this->errors[] = Tools::displayError('You do not have permission to add here.'); @@ -688,6 +689,7 @@ class AdminModulesControllerCore extends AdminController } elseif ($echo === false) $module_errors[] = array('name' => $name, 'message' => $module->getErrors()); + if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && isset(Context::getContext()->tmpOldShop)) { Context::getContext()->shop = clone(Context::getContext()->tmpOldShop);