From 588276cfb185feaa22786098ae144daeec2fb720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 6 Feb 2013 11:56:23 +0100 Subject: [PATCH] [-] FO: Fix fatal error when a customer is deleted and still logged --- config/config.inc.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index 612fd961b..a08d75c66 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -164,15 +164,21 @@ else if (isset($cookie->id_customer) && (int)$cookie->id_customer) { $customer = new Customer($cookie->id_customer); - $customer->logged = $cookie->logged; - - if ($customer->id_lang != $context->language->id) + if(!Validate::isLoadedObject($customer)) + $customer->logout(); + else { - $customer->id_lang = $context->language->id; - $customer->update(); + $customer->logged = $cookie->logged; + + if ($customer->id_lang != $context->language->id) + { + $customer->id_lang = $context->language->id; + $customer->update(); + } } } - else + + if (!isset($customer) || !Validate::isLoadedObject($customer)) { $customer = new Customer();