makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse source 
* 3.1.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:47 +01:00
commit 2251816b10
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_pm_viewfolder.php
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,
);
/**