From af024ea3e503a07f4ca0635d186866fa7c5b795f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Apr 2014 22:37:49 +0200
Subject: [PATCH] [ticket/10073] Global announcements have a forum_id now

PHPBB3-10073
---
 phpBB/phpbb/message/topic_form.php | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php
index d691c1e45f..5a5d090017 100644
--- a/phpBB/phpbb/message/topic_form.php
+++ b/phpBB/phpbb/message/topic_form.php
@@ -48,33 +48,14 @@ class topic_form extends form
 			return 'NO_TOPIC';
 		}
 
-		/**
-		* @todo remove else case when global topics have forum id
-		*/
-		if ($this->topic_row['forum_id'])
+		if (!$this->auth->acl_get('f_read', $this->topic_row['forum_id']))
 		{
-			if (!$this->auth->acl_get('f_read', $this->topic_row['forum_id']))
-			{
-				return 'SORRY_AUTH_READ';
-			}
-
-			if (!$this->auth->acl_get('f_email', $this->topic_row['forum_id']))
-			{
-				return 'NO_EMAIL';
-			}
+			return 'SORRY_AUTH_READ';
 		}
-		else
-		{
-			// If global announcement, we need to check if the user is able to at least read and email in one forum...
-			if (!$this->auth->acl_getf_global('f_read'))
-			{
-				return 'SORRY_AUTH_READ';
-			}
 
-			if (!$this->auth->acl_getf_global('f_email'))
-			{
-				return 'NO_EMAIL';
-			}
+		if (!$this->auth->acl_get('f_email', $this->topic_row['forum_id']))
+		{
+			return 'NO_EMAIL';
 		}
 
 		return false;