diff --git a/cache/class_index.php b/cache/class_index.php index 927841ff2..c3a6dc007 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -17,6 +17,8 @@ 'AdminAccountingExportControllerCore' => 'controllers/admin/AdminAccountingExportController.php', 'AdminAccountingManagementController' => 'override/controllers/admin/AdminAccountingManagementController.php', 'AdminAccountingManagementControllerCore' => 'controllers/admin/AdminAccountingManagementController.php', + 'AdminAccountingRegisteredNumberController' => '', + 'AdminAccountingRegisteredNumberControllerCore' => 'controllers/admin/AdminAccountingRegisteredNumberController.php', 'AdminAddonsCatalogController' => 'override/controllers/admin/AdminAddonsCatalogController.php', 'AdminAddonsCatalogControllerCore' => 'controllers/admin/AdminAddonsCatalogController.php', 'AdminAddonsMyAccountController' => 'override/controllers/admin/AdminAddonsMyAccountController.php', diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 46fa510f6..bff5f3b87 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -586,7 +586,10 @@ class AdminModulesControllerCore extends AdminController { $modules = Tools::getValue($key); if (strpos($modules, '|')) + { + $modules_list_save = $modules; $modules = explode('|', $modules); + } else $modules = empty($modules) ? false : array($modules); $module_errors = array(); @@ -725,7 +728,7 @@ class AdminModulesControllerCore extends AdminController } } if ($return) - Tools::redirectAdmin(self::$currentIndex.'&conf='.$return.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name)); + Tools::redirectAdmin(self::$currentIndex.'&conf='.$return.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '')); } public function postProcess() @@ -1049,7 +1052,7 @@ class AdminModulesControllerCore extends AdminController $modules[$km]->options['update_url'] = self::$currentIndex.'&update='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); $modules[$km]->options['uninstall_url'] = self::$currentIndex.'&uninstall='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); $modules[$km]->options['uninstall_onclick'] = ((!method_exists($module, 'onclickOption')) ? ((empty($module->confirmUninstall)) ? '' : 'return confirm(\''.addslashes($module->confirmUninstall).'\');') : $module->onclickOption('uninstall', $modules[$km]->options['uninstall_url'])); - if (Tools::getValue('module_name') == $module->name && (int)Tools::getValue('conf') > 0) + if ((Tools::getValue('module_name') == $module->name || in_array($module->name, explode('|', Tools::getValue('modules_list')))) && (int)Tools::getValue('conf') > 0) $modules[$km]->message = $this->_conf[(int)Tools::getValue('conf')]; if (isset($modules_preferences[$modules[$km]->name])) $modules[$km]->preferences = $modules_preferences[$modules[$km]->name];