// Merge -> 10309

controllers/front/AuthController.php

@@ -262,6 +262,7 @@ class AuthControllerCore extends FrontController
 			}
 			else
 			{
+				$this->context->cookie->id_compare = isset($this->context->cookie->id_compare) ? $this->context->cookie->id_compare: CompareProduct::getIdCompareByIdCustomer($customer->id);
 				$this->context->cookie->id_customer = (int)($customer->id);
 				$this->context->cookie->customer_lastname = $customer->lastname;
 				$this->context->cookie->customer_firstname = $customer->firstname;
@@ -278,10 +279,10 @@ class AuthControllerCore extends FrontController
 				$this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id));
 				$this->context->cart->update();
 				Hook::exec('authentication');
-				
+
 				// Login information have changed, so we check if the cart rules still apply
 				CartRule::autoRemoveFromCart();
-			
+
 				if (!$this->ajax)
 				{
 					if ($back = Tools::getValue('back'))
@@ -618,15 +619,15 @@ class AuthControllerCore extends FrontController
 	protected function sendConfirmationMail(Customer $customer)
 	{
 		return Mail::Send(
-			$this->context->language->id, 
-			'account', 
+			$this->context->language->id,
+			'account',
 			Mail::l('Welcome!'),
 			array(
-				'{firstname}' => $customer->firstname, 
-				'{lastname}' => $customer->lastname, 
-				'{email}' => $customer->email, 
-				'{passwd}' => Tools::getValue('passwd')), 
-			$customer->email, 
+				'{firstname}' => $customer->firstname,
+				'{lastname}' => $customer->lastname,
+				'{email}' => $customer->email,
+				'{passwd}' => Tools::getValue('passwd')),
+			$customer->email,
 			$customer->firstname.' '.$customer->lastname
 		);
 	}