diff options
| author | rxu <rxu@mail.ru> | 2014-09-07 18:54:34 +0800 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2014-09-07 18:54:34 +0800 |
| commit | 40ef561349072ccabe00a20fd60734042ae9389d (patch) | |
| tree | 0304464ff568b7e87110c9a89edd01528e65df4c | |
| parent | c1d0528d80327b9dcda62edf9ce05a5ce84eb472 (diff) | |
| download | forums-40ef561349072ccabe00a20fd60734042ae9389d.tar forums-40ef561349072ccabe00a20fd60734042ae9389d.tar.gz forums-40ef561349072ccabe00a20fd60734042ae9389d.tar.bz2 forums-40ef561349072ccabe00a20fd60734042ae9389d.tar.xz forums-40ef561349072ccabe00a20fd60734042ae9389d.zip | |
[ticket/13050] Allow topic/forum subscription when email/jabber is off
Currently, there's impossible to subscribe topic/forum if emails and/or jabber
is disabled. This seems to be a 3.0 leftover since 3.1 introduces new
notification system which handles this case and offers email/jabber-free
board notifications.
PHPBB3-13050
| -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 9ecbdea77a..be991da317 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']); |