diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-02 22:47:43 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-02 22:47:43 +0100 |
| commit | bc96a9f1f67df4719f66896590288eb03f6ca12d (patch) | |
| tree | 2d815afe15de616cfd6c597c3946f9741b5de433 | |
| parent | 4139e4f2b5889fc54bcc2b6451c925158633c632 (diff) | |
| parent | 7df7cfff33628b6111a841b690e90e535cd426e2 (diff) | |
| download | forums-bc96a9f1f67df4719f66896590288eb03f6ca12d.tar forums-bc96a9f1f67df4719f66896590288eb03f6ca12d.tar.gz forums-bc96a9f1f67df4719f66896590288eb03f6ca12d.tar.bz2 forums-bc96a9f1f67df4719f66896590288eb03f6ca12d.tar.xz forums-bc96a9f1f67df4719f66896590288eb03f6ca12d.zip | |
Merge pull request #4607 from marc1706/ticket/14953
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
* marc1706/ticket/14953:
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
| -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 3ae7876a72..3364206680 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -547,7 +547,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, ); /** |