diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-11 22:07:11 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-11 22:07:11 +0100 |
| commit | f3c9133a6c4f3a5abe465991a825f170e495a604 (patch) | |
| tree | a188b5b060b71a8b59617a9e7df16119b2f91cbf /phpBB/viewtopic.php | |
| parent | 945a63d204ca3a73a45c65563bef77a8a1df34fe (diff) | |
| parent | 1a19388aa38113262db648caedd4a745f5691ed1 (diff) | |
| download | forums-f3c9133a6c4f3a5abe465991a825f170e495a604.tar forums-f3c9133a6c4f3a5abe465991a825f170e495a604.tar.gz forums-f3c9133a6c4f3a5abe465991a825f170e495a604.tar.bz2 forums-f3c9133a6c4f3a5abe465991a825f170e495a604.tar.xz forums-f3c9133a6c4f3a5abe465991a825f170e495a604.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus
* nickvergessen/ticket/10237:
[ticket/10237] Display login-box for guests, when (un)subscribing
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 203b8586ce..df631a474c 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -493,9 +493,10 @@ $s_watching_topic = array( 'is_watching' => false, ); -if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify'] && $user->data['is_registered']) +if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify']) { - watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start, $topic_data['topic_title']); + $notify_status = (isset($topic_data['notify_status'])) ? $topic_data['notify_status'] : null; + watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $notify_status, $start, $topic_data['topic_title']); // Reset forum notification if forum notify is set if ($config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) |