dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge with revision 7841

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-02 11:43:58 +00:00
parent c945049ef1
commit ffeb22bfb9
130 changed files with 6620 additions and 18585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/AuthController.php
+9 -2
View File
@@ -303,8 +303,11 @@ class AuthControllerCore extends FrontController
}*/
if (!isset($selectedCountry))
$selectedCountry = (int)(Configuration::get('PS_COUNTRY_DEFAULT'));
$countries = Country::getCountries($this->context->language->id, true);
if (Configuration::get('PS_RESTRICT_DELIVERED_COUNTRIES'))
$countries = Carrier::getDeliveredCountries($this->context->language->id, true, true);
else
$countries = Country::getCountries($this->context->language->id, true);
$this->context->smarty->assign(array(
'countries' => $countries,
'sl_country' => (isset($selectedCountry) ? $selectedCountry : 0),
@@ -361,7 +364,11 @@ class AuthControllerCore extends FrontController
$this->context->smarty->assign('back', Tools::safeOutput($back));
if (strpos($back, 'order.php') !== false)
{
$countries = Country::getCountries($this->context->language->id, true);
if (Configuration::get('PS_RESTRICT_DELIVERED_COUNTRIES'))
$countries = Carrier::getDeliveredCountries($this->context->language->id, true, true);
else
$countries = Country::getCountries($this->context->language->id, true);
$this->context->smarty->assign(array(
'inOrderProcess' => true,
'PS_GUEST_CHECKOUT_ENABLED' => Configuration::get('PS_GUEST_CHECKOUT_ENABLED'),