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

[-] BO : fixed country listing #PSCFV-4438

Browse Source
This commit is contained in:
dMetzger
2012-09-27 07:36:41 +00:00
parent 2906d8ce6d
commit 6d7e162256
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+1 -1
View File
@@ -2072,7 +2072,7 @@ class AdminControllerCore extends Controller
{ {
foreach ($this->fields_list as $key => $array_value) foreach ($this->fields_list as $key => $array_value)
if (isset($array_value['filter_key'])) if (isset($array_value['filter_key']))
$this->_listsql .= str_replace('!', '.', $array_value['filter_key']).','; $this->_listsql .= str_replace('!', '.', $array_value['filter_key']).' as '.$key.',';
elseif ($key == 'id_'.$this->table) elseif ($key == 'id_'.$this->table)
$this->_listsql .= 'a.`'.bqSQL($key).'`,'; $this->_listsql .= 'a.`'.bqSQL($key).'`,';
elseif ($key != 'image' && !preg_match('/'.preg_quote($key, '/').'/i', $this->_select)) elseif ($key != 'image' && !preg_match('/'.preg_quote($key, '/').'/i', $this->_select))
controllers/admin/AdminCountriesController.php
+1 -1
View File
@@ -44,7 +44,7 @@ class AdminCountriesControllerCore extends AdminController
'enableSelection' => array('text' => $this->l('Enable selection')), 'enableSelection' => array('text' => $this->l('Enable selection')),
'disableSelection' => array('text' => $this->l('Disable selection')), 'disableSelection' => array('text' => $this->l('Disable selection')),
'affectzone' => array('text' => $this->l('Assign to a new zone')) 'affectzone' => array('text' => $this->l('Assign to a new zone'))
); );
$this->fieldImageSettings = array( $this->fieldImageSettings = array(
'name' => 'logo', 'name' => 'logo',