// MERGE with 1.4 r7770

This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
+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)