diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2011-07-20 00:55:49 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2011-11-06 23:51:29 +0100 |
| commit | 1a19388aa38113262db648caedd4a745f5691ed1 (patch) | |
| tree | 9726b5487b10fc7cf8c95cf483e7d6f1ceb151ea /phpBB/viewtopic.php | |
| parent | d60ffdd55c4066b8e69c0522c464ec1ada4b0913 (diff) | |
| download | forums-1a19388aa38113262db648caedd4a745f5691ed1.tar forums-1a19388aa38113262db648caedd4a745f5691ed1.tar.gz forums-1a19388aa38113262db648caedd4a745f5691ed1.tar.bz2 forums-1a19388aa38113262db648caedd4a745f5691ed1.tar.xz forums-1a19388aa38113262db648caedd4a745f5691ed1.zip | |
[ticket/10237] Display login-box for guests, when (un)subscribing
Also initialise $is_watching for PHP Notice: Undefined variable is_watching
PHPBB3-10237
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 8b081b4aec..bb88241481 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -486,9 +486,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)) |