diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-07-16 17:31:28 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-07-16 17:31:28 +0000 |
| commit | b8fa4851bb9bb4eae78657d356131734c8007c8e (patch) | |
| tree | 94f8ef3d1c97ec2e00b1f85422301ed49bd87732 /phpBB | |
| parent | bab8906f1301cc5b886d0a21fbfc23c9ab7dac25 (diff) | |
| download | forums-b8fa4851bb9bb4eae78657d356131734c8007c8e.tar forums-b8fa4851bb9bb4eae78657d356131734c8007c8e.tar.gz forums-b8fa4851bb9bb4eae78657d356131734c8007c8e.tar.bz2 forums-b8fa4851bb9bb4eae78657d356131734c8007c8e.tar.xz forums-b8fa4851bb9bb4eae78657d356131734c8007c8e.zip | |
Remove topic_vote
git-svn-id: file:///svn/phpbb/trunk@2700 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c458e94bb7..b66dcdc65d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -145,9 +145,9 @@ if ( $userdata['user_id'] != ANONYMOUS && isset($HTTP_POST_VARS['rating']) ) $join_sql_table = ( !$post_id ) ? '' : ', ' . POSTS_TABLE . ' p, ' . POSTS_TABLE . ' p2 '; $join_sql = ( !$post_id ) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND p.post_approved = " . TRUE . " AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_approved = " . TRUE . " AND p2.post_id <= $post_id"; $count_sql = ( !$post_id ) ? '' : ", COUNT(p2.post_id) AS prev_posts"; -$order_sql = ( !$post_id ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id ORDER BY p.post_id ASC"; +$order_sql = ( !$post_id ) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, f.forum_name, f.forum_status, f.forum_id ORDER BY p.post_id ASC"; -$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, f.forum_name, f.forum_status, f.forum_id " . $count_sql . " +$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, f.forum_name, f.forum_status, f.forum_id " . $count_sql . " FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . " WHERE $join_sql AND f.forum_id = t.forum_id |