diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index d202ccada..8ec50408e 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2284,7 +2284,7 @@ class AdminControllerCore extends Controller (isset($this->_filter) ? $this->_filter : '').$where_shop.' '.(isset($this->_group) ? $this->_group.' ' : '').' '.$having_clause.' - ORDER BY '.(($order_by == $this->identifier || $order_by == 'quantity') ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way). + ORDER BY '.(($order_by == $this->identifier) ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way). ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : ''). (($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : ''); diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 8f2ed09f0..001e24a65 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -513,7 +513,7 @@ class HelperListCore extends Helper if (Tools::getIsset($this->table.'Orderby')) $order = '&'.$this->table.'Orderby='.urlencode($this->orderBy).'&'.$this->table.'Orderway='.urlencode(strtolower($this->orderWay)); - $action = $this->currentIndex.$identifier.'&token='.$token.$order.'#'.$this->table; + $action = $this->currentIndex.$identifier.'&token='.$token.'#'.$this->table; /* Determine current page number */ $page = (int)Tools::getValue('submitFilter'.$this->list_id);