Merge branch '3.2.x'

* 3.2.x:
  [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
This commit is contained in:
Tristan Darricau 2017-01-02 22:47:51 +01:00
commit 387d76aa09
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -545,7 +545,7 @@ function get_pm_from($folder_id, $folder, $user_id)
AND $folder_sql
AND t.msg_id = p.msg_id
$sql_limit_time",
'ORDER' => $sql_sort_order,
'ORDER_BY' => $sql_sort_order,
);
/**