From 006bb7b19ae7728ce12043f4a10b7e73feead0d0 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Fri, 7 Dec 2012 16:23:52 +0100 Subject: [PATCH] [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order --- classes/Customer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/Customer.php b/classes/Customer.php index a3f28a894..ef5cd2ffe 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -426,6 +426,7 @@ class CustomerCore extends ObjectModel LEFT JOIN `'._DB_PREFIX_.'country` c ON (a.`id_country` = c.`id_country`) LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country`) LEFT JOIN `'._DB_PREFIX_.'state` s ON (s.`id_state` = a.`id_state`) + '.(Context::getContext()->shop->getGroup()->share_order ? '' : Shop::addSqlAssociation('country', 'c')).' WHERE `id_lang` = '.(int)$id_lang.' AND `id_customer` = '.(int)$this->id.' AND a.`deleted` = 0'; return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); }