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

[-] BO : FixBug #PSCFV-9329 Alias problem in order by

Browse Source
This commit is contained in:
Jerome Nadaud
2013-08-19 10:35:43 +02:00
parent dc4978ff57
commit a7f6e91ac0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Validate.php
+1 -1
View File
@@ -592,7 +592,7 @@ class ValidateCore
*/ */
public static function isOrderBy($order) public static function isOrderBy($order)
{ {
return preg_match('/^[a-zA-Z0-9._-]+$/', $order); return preg_match('/^[a-zA-Z0-9.!_-]+$/', $order);
} }
/** /**
classes/controller/AdminController.php
+2 -3
View File
@@ -2149,15 +2149,14 @@ class AdminControllerCore extends Controller
/* Cache */ /* Cache */
$this->_lang = (int)$id_lang; $this->_lang = (int)$id_lang;
$this->_orderBy = $order_by;
if (preg_match('/[.!]/', $order_by)) if (preg_match('/[.!]/', $order_by))
{ {
$order_by_split = preg_split('/[.!]/', $order_by); $order_by_split = preg_split('/[.!]/', $order_by);
$order_by = pSQL($order_by_split[0]).'.`'.pSQL($order_by_split[1]).'`'; $order_by = pSQL($order_by_split[0]).'.`'.pSQL($order_by_split[1]).'`';
$this->_orderBy = (isset($order_by_split) && isset($order_by_split[1])) ? $order_by_split[1] : $order_by;
} }
else
$this->_orderBy = $order_by;
$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 */