diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-08-29 20:44:41 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-08-29 20:44:41 +0530 |
| commit | df3bc78af8c39adeb090c6ab8ff345e34217c442 (patch) | |
| tree | 89ceb40308a7ca457e439f167de09f525057cb08 /phpBB/includes/ucp/ucp_main.php | |
| parent | 80a1314ebb1f3b180760beb3b780f87e1a43ea90 (diff) | |
| parent | 6d9c0a76df2ab2b55b8f863a412f0fcf10599196 (diff) | |
| download | forums-df3bc78af8c39adeb090c6ab8ff345e34217c442.tar forums-df3bc78af8c39adeb090c6ab8ff345e34217c442.tar.gz forums-df3bc78af8c39adeb090c6ab8ff345e34217c442.tar.bz2 forums-df3bc78af8c39adeb090c6ab8ff345e34217c442.tar.xz forums-df3bc78af8c39adeb090c6ab8ff345e34217c442.zip | |
Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
[ticket/12966] Sort by post_time and post_id where applicable
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 304c04eb3d..a1624e78ec 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -81,7 +81,7 @@ class ucp_main FROM $sql_from WHERE t.topic_type = " . POST_GLOBAL . ' AND ' . $db->sql_in_set('t.forum_id', $forum_ary) . ' - ORDER BY t.topic_last_post_time DESC'; + ORDER BY t.topic_last_post_time DESC, t.topic_last_post_id DESC'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) @@ -693,7 +693,7 @@ class ucp_main AND t.topic_id = tw.topic_id AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true), - 'ORDER_BY' => 't.topic_last_post_time DESC' + 'ORDER_BY' => 't.topic_last_post_time DESC, t.topic_last_post_id DESC' ); $sql_array['LEFT_JOIN'] = array(); @@ -710,7 +710,7 @@ class ucp_main 'WHERE' => 'b.user_id = ' . $user->data['user_id'] . ' AND ' . $db->sql_in_set('f.forum_id', $forbidden_forum_ary, true, true), - 'ORDER_BY' => 't.topic_last_post_time DESC' + 'ORDER_BY' => 't.topic_last_post_time DESC, t.topic_last_post_id DESC' ); $sql_array['LEFT_JOIN'] = array(); |