mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9976] Fix link to post when two posts have the same post_time.
This commit is contained in:
Andreas Fischer 2011-08-16 18:09:42 +02:00
commit 7ae11e3727
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/viewtopic.php
View File

@ -175,7 +175,7 @@ $sql_array = array(
// The FROM-Order is quite important here, else t.* columns can not be correctly bound. // The FROM-Order is quite important here, else t.* columns can not be correctly bound.
if ($post_id) 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'; $sql_array['FROM'][POSTS_TABLE] = 'p';
} }
@ -278,8 +278,16 @@ if ($post_id)
$sql = 'SELECT COUNT(p.post_id) AS prev_posts $sql = 'SELECT COUNT(p.post_id) AS prev_posts
FROM ' . POSTS_TABLE . " p FROM ' . POSTS_TABLE . " p
WHERE p.topic_id = {$topic_data['topic_id']} WHERE p.topic_id = {$topic_data['topic_id']}
" . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . ' " . ((!$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']}");
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); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);