// Merge -> revision 8800

2011-09-27 14:30:06 +00:00
parent cde0690abc
commit 91083e190c
110 changed files with 1240 additions and 1066 deletions
@@ -178,6 +178,9 @@ class AuthControllerCore extends FrontController
 								$this->context->cart->secure_key = $customer->secure_key;
 								$this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)($customer->id));
 								$this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id));
+
+								// If a logged guest logs in as a customer, the cart secure key was already set and needs to be updated
+								$this->context->cart->secure_key = $customer->secure_key;
 								$this->context->cart->update();
 								Module::hookExec('createAccount', array(
 									'_POST' => $_POST,