From 1e6c73a7cce060d682c411c9bf904fa6af3232da Mon Sep 17 00:00:00 2001 From: fSerny Date: Thu, 12 Jan 2012 09:51:45 +0000 Subject: [PATCH] [-] BO : Modules search now works even when filters are enabled --- controllers/admin/AdminModulesController.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index a6363c1eb..74be82496 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -811,6 +811,17 @@ class AdminModulesControllerCore extends AdminController return true; + // Filter on module name + $filter_name = Tools::getValue('filtername'); + if (!empty($filter_name)) + { + if (stristr($module->name, $filter_name) === false && stristr($module->displayName, $filter_name) === false && stristr($module->description, $filter_name) === false) + return true; + else + return false; + } + + // Filter on module category $categoryFiltered = array(); $filterCategories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)); @@ -862,12 +873,6 @@ class AdminModulesControllerCore extends AdminController return true; - // Filter on module name - $filter_name = Tools::getValue('filtername'); - if (!empty($filter_name) AND (stristr($module->name, $filter_name) === false AND stristr($module->displayName, $filter_name) === false AND stristr($module->description, $filter_name) === false)) - return true; - - // Module has not been filtered return false; }