From 4836fe224a737dc526334f53b8f70631d5fe79df Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 24 Dec 2012 10:32:41 +0100 Subject: [PATCH] [-] BO : fixed error display for bad queries #PSCFI-6913 --- classes/controller/AdminController.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 8721f794c..31329126b 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1460,11 +1460,14 @@ class AdminControllerCore extends Controller return false; $this->getList($this->context->language->id); + $helper = new HelperList(); + // Empty list is ok if (!is_array($this->_list)) + { + $this->displayWarning($this->l('Bad SQL query', 'Helper').'
'.htmlspecialchars($this->_list_error)); return false; - - $helper = new HelperList(); + } $this->setHelperDisplay($helper); $helper->tpl_vars = $this->tpl_list_vars; @@ -2107,8 +2110,10 @@ class AdminControllerCore extends Controller ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : ''). (($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : ''); - $this->_list = Db::getInstance()->executeS($this->_listsql); - $this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); + if (!($this->_list = Db::getInstance()->executeS($this->_listsql))) + $this->_list_error = Db::getInstance()->getMsgError(); + else + $this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); } public function getLanguages()