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/mcp | |
| 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/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index b4ec0092e7..ebcf7ce643 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -66,7 +66,7 @@ function mcp_front_view($id, $mode, $action) FROM ' . POSTS_TABLE . ' WHERE ' . $db->sql_in_set('forum_id', $forum_list) . ' AND ' . $db->sql_in_set('post_visibility', array(ITEM_UNAPPROVED, ITEM_REAPPROVE)) . ' - ORDER BY post_time DESC'; + ORDER BY post_time DESC, post_id DESC'; $result = $db->sql_query_limit($sql, 5); while ($row = $db->sql_fetchrow($result)) @@ -101,7 +101,7 @@ function mcp_front_view($id, $mode, $action) WHERE ' . $db->sql_in_set('p.post_id', $post_list) . ' AND t.topic_id = p.topic_id AND p.poster_id = u.user_id - ORDER BY p.post_time DESC'; + ORDER BY p.post_time DESC, p.post_id DESC'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) @@ -190,7 +190,7 @@ function mcp_front_view($id, $mode, $action) AND p.poster_id = u2.user_id AND ' . $db->sql_in_set('p.forum_id', $forum_list), - 'ORDER_BY' => 'p.post_time DESC', + 'ORDER_BY' => 'p.post_time DESC, p.post_id DESC', ); /** diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 92000c6ceb..f03bc034e4 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -1265,7 +1265,7 @@ function mcp_fork_topic($topic_ids) $sql = 'SELECT * FROM ' . POSTS_TABLE . " WHERE topic_id = $topic_id - ORDER BY post_time ASC"; + ORDER BY post_time ASC, post_id ASC"; $result = $db->sql_query($sql); $post_rows = array(); |