diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-30 16:45:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-30 16:45:37 +0200 |
| commit | cb74439046a4bfcf9856aa5bdeff430a8a672e44 (patch) | |
| tree | 3002c7e716fcbfcb65473f8ac26a41453f9d0da9 /phpBB/viewtopic.php | |
| parent | 9fd849b3fd846c5551c3a35ef40196687ce439cb (diff) | |
| parent | 25902c3bfcc539462e1d738d308bbbe8dfe15c4e (diff) | |
| download | forums-cb74439046a4bfcf9856aa5bdeff430a8a672e44.tar forums-cb74439046a4bfcf9856aa5bdeff430a8a672e44.tar.gz forums-cb74439046a4bfcf9856aa5bdeff430a8a672e44.tar.bz2 forums-cb74439046a4bfcf9856aa5bdeff430a8a672e44.tar.xz forums-cb74439046a4bfcf9856aa5bdeff430a8a672e44.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10199] Delete a useless join in viewtopic.
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index abfba42379..3b383210c9 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -175,7 +175,7 @@ $sql_array = array( // The FROM-Order is quite important here, else t.* columns can not be correctly bound. if ($post_id) { - $sql_array['SELECT'] .= ', p.post_approved'; + $sql_array['SELECT'] .= ', p.post_approved, p.post_time'; $sql_array['FROM'][POSTS_TABLE] = 'p'; } @@ -275,12 +275,11 @@ if ($post_id) } else { - $sql = 'SELECT COUNT(p1.post_id) AS prev_posts - FROM ' . POSTS_TABLE . ' p1, ' . POSTS_TABLE . " p2 - WHERE p1.topic_id = {$topic_data['topic_id']} - AND p2.post_id = {$post_id} - " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p1.post_approved = 1' : '') . ' - AND ' . (($sort_dir == 'd') ? 'p1.post_time >= p2.post_time' : 'p1.post_time <= p2.post_time'); + $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']}"); $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); |