From 4b5fab372ff69a809144dee3a0a7f90c219fe400 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 30 Jan 2008 16:14:39 +0000 Subject: merge with revision #r8350 git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewforum.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'phpBB/viewforum.php') diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 33e96d5b58..f41879da78 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -188,14 +188,16 @@ if ($forum_data['prune_next'] < time() && $forum_data['enable_prune']) } // Forum rules and subscription info -$s_watching_forum = $s_watching_forum_img = array(); -$s_watching_forum['link'] = $s_watching_forum['title'] = ''; -$s_watching_forum['is_watching'] = false; +$s_watching_forum = array( + 'link' => '', + 'title' => '', + 'is_watching' => false, +); if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) { $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; - watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $user->data['user_id'], $forum_id, 0, $notify_status); + watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status); } $s_forum_rules = ''; @@ -346,7 +348,7 @@ if ($forum_data['forum_type'] == FORUM_POST) 'SELECT' => $sql_array['SELECT'], '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 . ')', -- cgit v1.2.1