aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorDhruv <dhruv.goel92@gmail.com>2014-08-29 20:44:41 +0530
committerDhruv <dhruv.goel92@gmail.com>2014-08-29 20:44:41 +0530
commitdf3bc78af8c39adeb090c6ab8ff345e34217c442 (patch)
tree89ceb40308a7ca457e439f167de09f525057cb08 /phpBB/includes/functions.php
parent80a1314ebb1f3b180760beb3b780f87e1a43ea90 (diff)
parent6d9c0a76df2ab2b55b8f863a412f0fcf10599196 (diff)
downloadforums-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/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index af27ec1818..df613682a7 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1636,7 +1636,7 @@ function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $s
if (empty($sql_sort))
{
- $sql_sort = 'ORDER BY t.topic_last_post_time DESC';
+ $sql_sort = 'ORDER BY t.topic_last_post_time DESC, t.topic_last_post_id DESC';
}
if ($config['load_db_lastread'] && $user->data['is_registered'])