makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13050] Allow topic/forum subscription when email/jabber is off

Browse source 
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
This commit is contained in:
rxu 2014-09-07 18:54:34 +08:00
parent c1d0528d80
commit 40ef561349
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/viewforum.php
View file

@ -251,7 +251,7 @@ $s_watching_forum = array(
'is_watching' => false, '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; $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']); watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status, $start, $forum_data['forum_name']);

2
phpBB/viewtopic.php
View file

@ -449,7 +449,7 @@ $s_watching_topic = array(
'is_watching' => false, '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; $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']); watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $notify_status, $start, $topic_data['topic_title']);