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

// small fix for change position

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-02-12 10:46:48 +01:00
1 parent 5e5cbb0d65
commit 61e691d3a6
1 file changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+9 -6
View File
@@ -2041,7 +2041,14 @@ class AdminControllerCore extends Controller
/* Cache */ /* Cache */
$this->_lang = (int)$id_lang; $this->_lang = (int)$id_lang;
$this->_orderBy = (strpos($order_by, '.') !== false) ? substr($order_by, strpos($order_by, '.') + 1) : $order_by;
if (preg_match('/[.!]/', $order_by))
{
$order_by_split = preg_split('/[.!]/', $order_by);
$order_by = pSQL($order_by_split[0]).'.`'.pSQL($order_by_split[1]).'`';
}
$this->_orderBy = $order_by_split[1];
$this->_orderWay = Tools::strtoupper($order_way); $this->_orderWay = Tools::strtoupper($order_way);
/* SQL table : orders, but class name is Order */ /* SQL table : orders, but class name is Order */
@@ -2100,11 +2107,7 @@ class AdminControllerCore extends Controller
$having_clause .= $this->_having.' '; $having_clause .= $this->_having.' ';
} }
if (preg_match('/[.!]/', $order_by))
{
$order_by = preg_split('/[.!]/', $order_by);
$order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`';
}
$this->_listsql = ' $this->_listsql = '
SELECT SQL_CALC_FOUND_ROWS SELECT SQL_CALC_FOUND_ROWS