From 75df12dd943ba20f14b3f4f06a0f1e79c3a46ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 12 Nov 2013 18:49:52 +0100
Subject: [PATCH] [-] Core: Group::getCurrent() return the default customer
 group of the shop if default customer group is not associated to shop

---
 classes/Group.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/classes/Group.php b/classes/Group.php
index 08893046f..2e43e5f0d 100644
--- a/classes/Group.php
+++ b/classes/Group.php
@@ -305,12 +305,21 @@ class GroupCore extends ObjectModel
 	public static function getCurrent()
 	{
 		static $groups = array();
+
 		$customer = Context::getContext()->customer;
 		if (Validate::isLoadedObject($customer))
+		{
 			$id_group = (int)$customer->id_default_group;
+			$group = new Group((int)$id_group);
+			if (!$group->isAssociatedToShop(Context::getContext()->shop->id))
+				$group = new Group((int)Configuration::get('PS_CUSTOMER_GROUP'));
+		}
 		else
 			$id_group = (int)Configuration::get('PS_UNIDENTIFIED_GROUP');
-		
+
+		if (!isset($groups[$id_group]) && isset($group))
+			$groups[$id_group] = $group;
+
 		if (!isset($groups[$id_group]))
 			$groups[$id_group] = new Group($id_group);