From f5aefc80ad2a1b143b7a5f62aef5bad08ff76146 Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Thu, 15 Dec 2011 11:09:34 +0000 Subject: [PATCH] // fixed hook::exec when no controller exists, bis git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11250 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Hook.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Hook.php b/classes/Hook.php index 208460337..fc22e1ed2 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -225,7 +225,7 @@ class HookCore extends ObjectModel // Hook list for live edit $ctrl = Context::getContext()->controller; - if (is_object($ctrl) && !in_array($hook_name, $ctrl->controller->hook_list)) + if ($ctrl && !in_array($hook_name, $ctrl->hook_list)); Context::getContext()->controller->hook_list[Hook::getIdByName($hook_name)] = $hook_name; $live_edit = false;