// MERGE with 1.4 r7770

modules/paypal/express/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/paypal/express/submit.php

@@ -299,8 +299,10 @@ function displayAccount()
 	// Select the most appropriate country
 	if (Tools::getValue('id_country'))
 		$selectedCountry = (int)(Tools::getValue('id_country'));
-	else
+	else if ((int)$result['COUNTRYCODE'])
+	{
 		$selectedCountry = Country::getByIso(strval($result['COUNTRYCODE']));
+	}
 	$countries = Country::getCountries((int)($cookie->id_lang), true);
 
 	// Smarty assigns
@@ -333,10 +335,12 @@ function displayAccount()
 
 // #####
 // Process !!
-
-if (!$cookie->isLogged(true))
+/*if (!$cookie->isLogged(true))
+{
+	displayAccount();
 	die('Not logged');
-elseif (!$cart->getOrderTotal(true, Cart::BOTH))
+}*/
+if (!$cart->getOrderTotal(true, Cart::BOTH))
 	die('Empty cart');
 
 // No token, we need to get one by making PayPal Authorisation