From 9c7eab66e709abe3a094e2fd4835432a4a8b45c3 Mon Sep 17 00:00:00 2001 From: fSerny Date: Wed, 21 Dec 2011 12:52:29 +0000 Subject: [PATCH] [-] PROJECT : Merge cache exec in class Hook (to maintain retrocompatibility) git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11477 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Hook.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/classes/Hook.php b/classes/Hook.php index 877e3fd5f..aaacc458f 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -195,10 +195,15 @@ class HookCore extends ObjectModel { $hook_name = strtolower($hook_name); $retro_hook_name = strtolower($retro_hook_name); + + $return = array(); if (isset(self::$_hook_modules_cache_exec[$hook_name])) - return self::$_hook_modules_cache_exec[$hook_name]; + $return = array_merge((array)$return, (array)self::$_hook_modules_cache_exec[$hook_name]); if (isset(self::$_hook_modules_cache_exec[$retro_hook_name])) - return self::$_hook_modules_cache_exec[$retro_hook_name]; + $return = array_merge((array)$return, (array)self::$_hook_modules_cache_exec[$retro_hook_name]); + + if (count($return) > 0) + return $return; return false; }