From 2dee304b0e43d5eac93da7b3370ed43383a295d5 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Wed, 26 Feb 2003 18:54:31 +0000
Subject: [PATCH] oops, simple case of "idiotitis paulicus" ... be gone double
 announcements

git-svn-id: file:///svn/phpbb/trunk@3549 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewforum.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 22a5438b74..b7482f641f 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -264,7 +264,7 @@ if ($forum_data['forum_postable'])
 
 //	if (empty($forum_data['topics_list']))
 //	{
-		$sql = 'SELECT 	t.*, lr.lastread_time, lr.lastread_type
+		$sql = 'SELECT t.*, lr.lastread_time, lr.lastread_type
 			FROM (' . TOPICS_TABLE . ' t
 			LEFT JOIN ' . LASTREAD_TABLE . ' lr ON lr.topic_id = t.topic_id 
 				AND lr.user_id = ' . $user->data['user_id'] . ")
@@ -288,6 +288,7 @@ if ($forum_data['forum_postable'])
 				AND lr.user_id = ' . $user->data['user_id'] . ")
 			WHERE t.forum_id = $forum_id 
 				AND t.topic_approved = 1 
+				AND t.topic_type <> " . POST_ANNOUNCE . " 
 				$limit_topics_time
 			ORDER BY t.topic_type DESC, $sort_order_sql
 			LIMIT $start, " . $config['topics_per_page'];
@@ -328,7 +329,6 @@ if ($forum_data['forum_postable'])
 	}
 */
 
-
 	// Okay, lets dump out the page ...
 	if ($total_topics)
 	{