Fix for moved topics

This commit is contained in:
Ice
2008-02-03 19:18:20 +00:00
parent c1f50e0c87
commit 049a772f54
2 changed files with 2 additions and 0 deletions

View File

@@ -201,6 +201,7 @@ if( $poll_forums === TRUE )
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f
WHERE t.forum_id = f.forum_id AND t.topic_approved = 1 AND t.poll_start > 0 WHERE t.forum_id = f.forum_id AND t.topic_approved = 1 AND t.poll_start > 0
{$where} {$where}
AND t.topic_moved_id = 0
ORDER BY t.poll_start DESC"; ORDER BY t.poll_start DESC";
$limit = ( isset($portal_config['portal_poll_limit']) ) ? $portal_config['portal_poll_limit'] : 3; $limit = ( isset($portal_config['portal_poll_limit']) ) ? $portal_config['portal_poll_limit'] : 3;

View File

@@ -190,6 +190,7 @@ function phpbb_fetch_posts($forum_from, $number_of_posts, $text_length, $time, $
' . $post_time . ' ' . $post_time . '
AND t.topic_status <> 2 AND t.topic_status <> 2
AND t.topic_approved = 1 AND t.topic_approved = 1
AND t.topic_moved_id = 0
' . $str_where .' ' . $str_where .'
ORDER BY ORDER BY
' . $topic_order; ' . $topic_order;