diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-10-10 17:58:32 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-10-10 17:58:32 +0000 |
| commit | 5ce6035aad3c85b6dc30d523903d8b7c377f7a5a (patch) | |
| tree | 143f961eea12011471ed11351cd777117404c16c /phpBB/viewforum.php | |
| parent | 746b617807048de6f768a74c6d852aeeea8f3a28 (diff) | |
| download | forums-5ce6035aad3c85b6dc30d523903d8b7c377f7a5a.tar forums-5ce6035aad3c85b6dc30d523903d8b7c377f7a5a.tar.gz forums-5ce6035aad3c85b6dc30d523903d8b7c377f7a5a.tar.bz2 forums-5ce6035aad3c85b6dc30d523903d8b7c377f7a5a.tar.xz forums-5ce6035aad3c85b6dc30d523903d8b7c377f7a5a.zip | |
Merging r8993, r8994, r8995
git-svn-id: file:///svn/phpbb/trunk@8996 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 2314794800..1d851edb3e 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -203,7 +203,7 @@ $s_watching_forum = array( 'is_watching' => false, ); -if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) +if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $forum_data['forum_type'] == FORUM_POST && $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, $user->data['user_id'], $forum_id, 0, $notify_status); |