From c374380a925fcb86a67ae0ee102449506b8a8ea4 Mon Sep 17 00:00:00 2001 From: DamienMetzger Date: Thu, 22 Nov 2012 15:46:33 +0100 Subject: [PATCH] [-] BO : fixed sorting and filter in BO tabs #PSCFV-5618 --- classes/controller/AdminController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index b2d4a4af2..9ba604af3 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2069,12 +2069,18 @@ class AdminControllerCore extends Controller if ($this->explicitSelect) { foreach ($this->fields_list as $key => $array_value) + { + // Add it only if it is not already in $this->_select + if (isset($this->_select) && preg_match('/'.preg_quote($key, '/').'`?\s*,/', $this->_select)) + continue; + if (isset($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)) $this->_listsql .= '`'.bqSQL($key).'`,'; + } $this->_listsql = rtrim($this->_listsql, ','); } else