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

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/AuthController.php
+3 -8
View File
@@ -27,13 +27,8 @@
class AuthControllerCore extends FrontController
{
public function __construct()
{
$this->ssl = true;
$this->php_self = 'authentication.php';
parent::__construct();
}
public $ssl = true;
public $php_self = 'authentication.php';
public function preProcess()
{
@@ -388,7 +383,7 @@ class AuthControllerCore extends FrontController
protected function processAddressFormat()
{
$addressItems = array();
$addressFormat = AddressFormat::getOrderedAddressFields(Configuration::get('PS_COUNTRY_DEFAULT'));
$addressFormat = AddressFormat::getOrderedAddressFields(Configuration::get('PS_COUNTRY_DEFAULT'), false, true);
$requireFormFieldsList = AddressFormat::$requireFormFieldsList;
foreach ($addressFormat as $addressline)