diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-03-11 00:38:56 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-04-07 13:45:44 +0200 |
| commit | 3352141264993982215b714ac7a128854494ac1f (patch) | |
| tree | 1fc4a4d85919402e957b1ce6448764aad791bc0d /phpBB/viewforum.php | |
| parent | 7074d19c4087fab0e81a31bd806724d7eac7ef87 (diff) | |
| download | forums-3352141264993982215b714ac7a128854494ac1f.tar forums-3352141264993982215b714ac7a128854494ac1f.tar.gz forums-3352141264993982215b714ac7a128854494ac1f.tar.bz2 forums-3352141264993982215b714ac7a128854494ac1f.tar.xz forums-3352141264993982215b714ac7a128854494ac1f.zip | |
[ticket/9684] Remove code for global announcement in root-files
PHPBB3-9684
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 16d8b56d88..ebf2dc3501 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -365,8 +365,8 @@ if ($forum_data['forum_type'] == FORUM_POST) 'FROM' => $sql_array['FROM'], 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], - 'WHERE' => 't.forum_id IN (' . $forum_id . ', 0) - AND t.topic_type IN (' . POST_ANNOUNCE . ', ' . POST_GLOBAL . ')', + 'WHERE' => '(t.forum_id = ' . $forum_id . ' + AND t.topic_type = ' . POST_ANNOUNCE . ') OR t.topic_type = ' . POST_GLOBAL, 'ORDER_BY' => 't.topic_time DESC', )); |