diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-11 22:17:12 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-11 22:17:12 +0100 |
| commit | 019e43bc2df44cd9282b381733c00afd79dea921 (patch) | |
| tree | dc6e1fc0946bce7032677276873777375eb9603a /phpBB/viewforum.php | |
| parent | 5546e8cf5711e2514d1a42398b9289fe56f685e3 (diff) | |
| parent | f3c9133a6c4f3a5abe465991a825f170e495a604 (diff) | |
| download | forums-019e43bc2df44cd9282b381733c00afd79dea921.tar forums-019e43bc2df44cd9282b381733c00afd79dea921.tar.gz forums-019e43bc2df44cd9282b381733c00afd79dea921.tar.bz2 forums-019e43bc2df44cd9282b381733c00afd79dea921.tar.xz forums-019e43bc2df44cd9282b381733c00afd79dea921.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10237] Display login-box for guests, when (un)subscribing
Conflicts:
phpBB/includes/functions_display.php
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 62cf939545..454dc3eaee 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -209,7 +209,7 @@ $s_watching_forum = array( 'is_watching' => false, ); -if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $forum_data['forum_type'] == FORUM_POST && $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) || $user->data['user_id'] == ANONYMOUS)) { $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, $start, $forum_data['forum_name']); |