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/viewtopic.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/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 a1976e169d..ceb9f3ea1c 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -454,9 +454,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)) |