From 791dd3e6a69864878fe07e7b56018836fe3fd010 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Mon, 10 Oct 2011 09:18:11 +0000 Subject: [PATCH] [-][-] FO : not check if Object employee is Load git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9173 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/shop/Shop.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index a2745f9c8..d605fffda 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -379,8 +379,8 @@ class ShopCore extends ObjectModel $employee = Context::getContext()->employee; - /* if the profile isn't a superAdmin */ - if ($employee && $employee->id_profile != _PS_ADMIN_PROFILE_) + // If the profile isn't a superAdmin + if (Validate::isLoadedObject($employee) && $employee->id_profile != _PS_ADMIN_PROFILE_) { $select .= ', es.id_employee'; $from .= 'LEFT JOIN '._DB_PREFIX_.'employee_shop es ON es.id_shop = s.id_shop';