diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-08 21:23:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-08 21:23:46 +0200 |
| commit | 3458aa2482484dfa32c8aa802680cf3f0b61161a (patch) | |
| tree | 489d31150f089ca0ac0055f442404afa261f7c76 /phpBB | |
| parent | bcd4cebd489a7c71b97b608b921e8b89e676fcc4 (diff) | |
| parent | 40ef561349072ccabe00a20fd60734042ae9389d (diff) | |
| download | forums-3458aa2482484dfa32c8aa802680cf3f0b61161a.tar forums-3458aa2482484dfa32c8aa802680cf3f0b61161a.tar.gz forums-3458aa2482484dfa32c8aa802680cf3f0b61161a.tar.bz2 forums-3458aa2482484dfa32c8aa802680cf3f0b61161a.tar.xz forums-3458aa2482484dfa32c8aa802680cf3f0b61161a.zip | |
Merge pull request #2931 from rxu/ticket/13050
[ticket/13050] Allow topic/forum subscription when email/jabber is off
* rxu/ticket/13050:
[ticket/13050] Allow topic/forum subscription when email/jabber is off
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/viewforum.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index cc5755349b..d186d468df 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -251,7 +251,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) || $user->data['user_id'] == ANONYMOUS)) +if ($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']); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 3c837bd136..f8b4a54f05 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -449,7 +449,7 @@ $s_watching_topic = array( 'is_watching' => false, ); -if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify']) +if ($config['allow_topic_notify']) { $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']); |