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

[-] BO : fixed error display for bad queries #PSCFI-6913

Browse Source
This commit is contained in:
Damien Metzger committed 2012-12-24 10:32:41 +01:00
1 parent db5b90bfeb
commit 4836fe224a
1 file changed
+9 -4
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+9 -4
View File
@@ -1460,11 +1460,14 @@ class AdminControllerCore extends Controller
return false; return false;
$this->getList($this->context->language->id); $this->getList($this->context->language->id);
$helper = new HelperList();
// Empty list is ok // Empty list is ok
if (!is_array($this->_list)) if (!is_array($this->_list))
{
$this->displayWarning($this->l('Bad SQL query', 'Helper').'<br />'.htmlspecialchars($this->_list_error));
return false; return false;
}
$helper = new HelperList();
$this->setHelperDisplay($helper); $this->setHelperDisplay($helper);
$helper->tpl_vars = $this->tpl_list_vars; $helper->tpl_vars = $this->tpl_list_vars;
@@ -2107,8 +2110,10 @@ class AdminControllerCore extends Controller
($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : ''). ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : '').
(($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : ''); (($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : '');
$this->_list = Db::getInstance()->executeS($this->_listsql); if (!($this->_list = Db::getInstance()->executeS($this->_listsql)))
$this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); $this->_list_error = Db::getInstance()->getMsgError();
else
$this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`');
} }
public function getLanguages() public function getLanguages()