diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-04 14:44:19 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-06-04 14:44:19 +0000 |
| commit | 3ecdbd068cfb904705be07d718881dc727e3665f (patch) | |
| tree | 6b1007903b21fe536998eb411b4f94421c9999e9 | |
| parent | 374093d6152ff9ff2b232311bfeeafca43a27915 (diff) | |
| download | forums-3ecdbd068cfb904705be07d718881dc727e3665f.tar forums-3ecdbd068cfb904705be07d718881dc727e3665f.tar.gz forums-3ecdbd068cfb904705be07d718881dc727e3665f.tar.bz2 forums-3ecdbd068cfb904705be07d718881dc727e3665f.tar.xz forums-3ecdbd068cfb904705be07d718881dc727e3665f.zip | |
#28025
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8595 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e0fb51610b..96b639e34b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -110,6 +110,7 @@ <li>[Change] Show email ban reason on registration. Additionally allow custom errors properly returned if using validate_data(). (Bug #26885)</li> <li>[Feature] Streamlined banning via the MCP by adding a ban link to the user profile. Also pre-fills ban fields as far as possible.</li> <li>[Feature] Added ACP logout to reset an admin session.</li> + <li>[Fix] reset forum notifications in viewtopic (Bug #28025)</li> </ul> diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 810f944529..77450813be 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 |