aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_main.php
diff options
context:
space:
mode:
authorDhruv Goel <dhruv.goel92@gmail.com>2014-08-29 20:44:01 +0530
committerDhruv Goel <dhruv.goel92@gmail.com>2014-08-29 20:44:01 +0530
commit6d9c0a76df2ab2b55b8f863a412f0fcf10599196 (patch)
tree8d1c346db0ae10982086a145b3323232d70aeaf8 /phpBB/includes/ucp/ucp_main.php
parentcbbef46c6cd3d453019779db0d6ef700cf11762b (diff)
parente5e45f860b798c955f1817001f07aabcbccbabcf (diff)
downloadforums-6d9c0a76df2ab2b55b8f863a412f0fcf10599196.tar
forums-6d9c0a76df2ab2b55b8f863a412f0fcf10599196.tar.gz
forums-6d9c0a76df2ab2b55b8f863a412f0fcf10599196.tar.bz2
forums-6d9c0a76df2ab2b55b8f863a412f0fcf10599196.tar.xz
forums-6d9c0a76df2ab2b55b8f863a412f0fcf10599196.zip
Merge pull request #2865 from marc1706/ticket/12966
[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.php6
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();