From 6d7e162256edea3525cc25f0fcce88d1d87acdc6 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Thu, 27 Sep 2012 07:36:41 +0000 Subject: [PATCH] [-] BO : fixed country listing #PSCFV-4438 --- classes/controller/AdminController.php | 2 +- controllers/admin/AdminCountriesController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 54dfcb390..faeb9290f 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2072,7 +2072,7 @@ class AdminControllerCore extends Controller { foreach ($this->fields_list as $key => $array_value) 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) $this->_listsql .= 'a.`'.bqSQL($key).'`,'; elseif ($key != 'image' && !preg_match('/'.preg_quote($key, '/').'/i', $this->_select)) diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index b4d002e48..f1f3ab585 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -44,7 +44,7 @@ class AdminCountriesControllerCore extends AdminController 'enableSelection' => array('text' => $this->l('Enable selection')), 'disableSelection' => array('text' => $this->l('Disable selection')), 'affectzone' => array('text' => $this->l('Assign to a new zone')) - ); + ); $this->fieldImageSettings = array( 'name' => 'logo',