From 7285487e5bdc0b28e1868056683ac57b31c3e027 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Tue, 16 Oct 2001 17:15:25 +0000
Subject: [PATCH] Fix a few things left over from old global announce stuff

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

diff --git a/phpBB/posting.php b/phpBB/posting.php
index 5cbac0cca7..a6fdb1436d 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -941,10 +941,11 @@ if( ( $submit || $confirm || $mode == "delete"  ) && !$error )
 					{
 						$sql .= ", forum_topics = forum_topics + 1";
 					}
+
+					$sql .= " WHERE forum_id = $forum_id";
 					
 /*					if( $topic_type != POST_GLOBAL_ANNOUNCE )
 					{		
-						$sql .= " WHERE forum_id = $forum_id";
 					}
 */
 					if($db->sql_query($sql))
@@ -2255,7 +2256,7 @@ if( $mode == 'newtopic' || ( $mode == 'editpost' && $is_first_post_topic ) )
 
 	if( $userdata['user_level'] == ADMIN )
 	{
-		$global_announce_toggle = '<input type="radio" name="topictype" value="announce"';
+		$global_announce_toggle = '<input type="radio" name="topictype" value="global"';
 		if( $topic_type == POST_GLOBAL_ANNOUNCE )
 		{
 			$global_announce_toggle .= ' checked="checked"';