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/phpbb/feed/forum.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/phpbb/feed/forum.php')
| -rw-r--r-- | phpBB/phpbb/feed/forum.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php index 610b755af3..7a2087c1cd 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -94,7 +94,7 @@ class forum extends \phpbb\feed\post_base WHERE forum_id = ' . $this->forum_id . ' AND topic_moved_id = 0 AND ' . $this->content_visibility->get_visibility_sql('topic', $this->forum_id) . ' - ORDER BY topic_last_post_time DESC'; + ORDER BY topic_last_post_time DESC, topic_last_post_id DESC'; $result = $this->db->sql_query_limit($sql, $this->num_items); $topic_ids = array(); @@ -123,7 +123,7 @@ class forum extends \phpbb\feed\post_base AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . ' AND p.post_time >= ' . $min_post_time . ' AND p.poster_id = u.user_id', - 'ORDER_BY' => 'p.post_time DESC', + 'ORDER_BY' => 'p.post_time DESC, p.post_id DESC', ); return true; |