// Hook modules exceptions now works with new dispatcher

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7587 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 15:16:16 +00:00
parent 143022e488
commit 39d0acc30b
3 changed files with 68 additions and 24 deletions
@@ -783,9 +783,8 @@ abstract class ModuleCore
 				continue;

 			$exceptions = $moduleInstance->getExceptions($array['id_hook']);
-			foreach ($exceptions AS $exception)
-				if (strstr(basename($_SERVER['PHP_SELF']).'?'.$_SERVER['QUERY_STRING'], $exception))
-					continue 2;
+			if (in_array(Dispatcher::$controller, $exceptions))
+				continue;

 			if (is_callable(array($moduleInstance, 'hook'.$hook_name)))
 			{