From 8b8b09452dfd41aa26440811721e3334f22383d9 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Wed, 11 Jan 2012 15:13:21 +0000
Subject: [PATCH] [-] FO : #PSTEST-407 - Fixed problem with groups and carrier
 edition

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12358 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/admin/AdminCarriersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
index 38a766a38..c0fa007a2 100644
--- a/controllers/admin/AdminCarriersController.php
+++ b/controllers/admin/AdminCarriersController.php
@@ -585,7 +585,7 @@ class AdminCarriersControllerCore extends AdminController
 
 		$groups = Group::getGroups($this->context->language->id);
 		// if empty $carrier_groups_ids : object creation : we set the default groups
-		if (empty($carrier_groups_ids))
+		if (empty($carrier_groups_ids) && !$obj->id)
 		{
 			$preselected = array(Configuration::get('PS_UNIDENTIFIED_GROUP'), Configuration::get('PS_GUEST_GROUP'), Configuration::get('PS_CUSTOMER_GROUP'));
 			$carrier_groups_ids = array_merge($carrier_groups_ids, $preselected);