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/StoresController.php
+2 -7
View File
@@ -27,12 +27,7 @@
class StoresControllerCore extends FrontController
{
public function __construct()
{
$this->php_self = 'stores.php';
parent::__construct();
}
public $php_self = 'stores.php';
public function preProcess()
{
@@ -157,7 +152,7 @@ class StoresControllerCore extends FrontController
$out = '';
$out_datas = array();
$address_datas = AddressFormat::getOrderedAddressFields($store['id_country']);
$address_datas = AddressFormat::getOrderedAddressFields($store['id_country'], false, true);
$state = (isset($store['id_state'])) ? new State($store['id_state']) : NULL;
foreach ($address_datas as $data_line)