diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-05 14:11:42 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-05 14:11:42 +0000 |
| commit | 8822747b91883b0b9ddf322ce052ccb11f4429d5 (patch) | |
| tree | 50a33184cf10fc0b8ae241bf68c8658ca675844f /phpBB/viewtopic.php | |
| parent | ea3eb9e9c3c2144fbb50cc2d78412fe8a854058f (diff) | |
| download | forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.gz forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.bz2 forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.tar.xz forums-8822747b91883b0b9ddf322ce052ccb11f4429d5.zip | |
merge...
git-svn-id: file:///svn/phpbb/trunk@8610 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 7577afc0ff..8c4ddb1505 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -451,9 +451,16 @@ $s_watching_topic = array( 'is_watching' => false, ); -if ($config['email_enable'] && $config['allow_topic_notify'] && $user->data['is_registered']) +if (($config['email_enable'] || $config['jab_enable']) && $config['allow_topic_notify'] && $user->data['is_registered']) { watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start); + + // Reset forum notification if forum notify is set + if ($config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) + { + $s_watching_forum = $s_watching_topic; + watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0); + } } // Bookmarks |