From ec4e6634d4aa9162b3e8a591e27abb6886b260e5 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Mon, 26 Nov 2012 15:33:34 +0100 Subject: [PATCH] small fix --- classes/module/Module.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/classes/module/Module.php b/classes/module/Module.php index 0d02d66ba..fb11e2e44 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -511,7 +511,7 @@ abstract class ModuleCore return false; } - + /** * This function enable module $name. If an $name is an array, * this will enable all of them @@ -525,10 +525,12 @@ abstract class ModuleCore // If $name is not an array, we set it as an array if (!is_array($name)) $name = array($name); - + $res = true; // Enable each module - foreach ($name as $k => $v) - Module::getInstanceByName($name)->enable(); + foreach ($name as $n) + if (Validate::isModuleName($n)) + $res &= Module::getInstanceByName($n)->enable(); + return $res; } /** @@ -574,12 +576,12 @@ abstract class ModuleCore // If $name is not an array, we set it as an array if (!is_array($name)) $name = array($name); - + $res = true; // Disable each module - foreach ($name as $k => $v) - Module::getInstanceByName($name)->disable(); - - return true; + foreach ($name as $n) + if (Validate::isModuleName($n)) + $res &= Module::getInstanceByName($n)->disable(); + return $res; } /**