diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-02 22:47:47 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-02 22:47:47 +0100 |
| commit | 2251816b10a300a873c1b5191d21445461e0d89d (patch) | |
| tree | 1c0c462c66cad171f1be56e6d741c61da226c9fa /phpBB/includes/ucp | |
| parent | 1f65f85b538ac45ce7520d31af875f088bf468b0 (diff) | |
| parent | bc96a9f1f67df4719f66896590288eb03f6ca12d (diff) | |
| download | forums-2251816b10a300a873c1b5191d21445461e0d89d.tar forums-2251816b10a300a873c1b5191d21445461e0d89d.tar.gz forums-2251816b10a300a873c1b5191d21445461e0d89d.tar.bz2 forums-2251816b10a300a873c1b5191d21445461e0d89d.tar.xz forums-2251816b10a300a873c1b5191d21445461e0d89d.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index a06d1bd0a6..b5bb406d7d 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -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, ); /** |