diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-08-16 18:09:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-08-16 18:09:21 +0200 |
| commit | a91131c55e468811ac6ce4abf637c755b83e0caa (patch) | |
| tree | 9be50f23ce3aade4a827d3be78b3e97dae77590b | |
| parent | a6dd3d0c65026bdeadd312f726f3197263607a04 (diff) | |
| parent | bb7e8bb4244eece7dbbe2a81216b9da976f6c0e9 (diff) | |
| download | forums-a91131c55e468811ac6ce4abf637c755b83e0caa.tar forums-a91131c55e468811ac6ce4abf637c755b83e0caa.tar.gz forums-a91131c55e468811ac6ce4abf637c755b83e0caa.tar.bz2 forums-a91131c55e468811ac6ce4abf637c755b83e0caa.tar.xz forums-a91131c55e468811ac6ce4abf637c755b83e0caa.zip | |
Merge remote-tracking branch 'p/ticket/9976' into develop-olympus
* p/ticket/9976:
[ticket/9976] Fix link to post when two posts have the same post_time.
| -rw-r--r-- | phpBB/viewtopic.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index f1ab30aad3..203b8586ce 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -196,7 +196,7 @@ if ($db->sql_layer === 'firebird') // The FROM-Order is quite important here, else t.* columns can not be correctly bound. if ($post_id) { - $sql_array['SELECT'] .= ', p.post_approved, p.post_time'; + $sql_array['SELECT'] .= ', p.post_approved, p.post_time, p.post_id'; $sql_array['FROM'][POSTS_TABLE] = 'p'; } @@ -317,8 +317,16 @@ if ($post_id) $sql = 'SELECT COUNT(p.post_id) AS prev_posts FROM ' . POSTS_TABLE . " p WHERE p.topic_id = {$topic_data['topic_id']} - " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . ' - AND ' . (($sort_dir == 'd') ? "p.post_time >= {$topic_data['post_time']}" : "p.post_time <= {$topic_data['post_time']}"); + " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : ''); + + if ($sort_dir == 'd') + { + $sql .= " AND (p.post_time > {$topic_data['post_time']} OR (p.post_time = {$topic_data['post_time']} AND p.post_id >= {$topic_data['post_id']}))"; + } + else + { + $sql .= " AND (p.post_time < {$topic_data['post_time']} OR (p.post_time = {$topic_data['post_time']} AND p.post_id <= {$topic_data['post_id']}))"; + } $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); |