1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-31 20:11:54 +02:00

[ticket/9684] Remove code for global announcement in root-files

PHPBB3-9684
This commit is contained in:
Joas Schilling
2010-03-11 00:38:56 +01:00
parent 7074d19c40
commit 3352141264
10 changed files with 55 additions and 432 deletions

View File

@@ -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',
));