diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 17:06:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 17:06:26 +0000 |
| commit | f8124b2117bf3abce4671cd2aa529b65b2103193 (patch) | |
| tree | b4a07ae4295a48e22a4d5d8771e47c94fa656bbc /phpBB | |
| parent | 35236eb0458d6be0bb04632977eaf4f322fa9653 (diff) | |
| download | forums-f8124b2117bf3abce4671cd2aa529b65b2103193.tar forums-f8124b2117bf3abce4671cd2aa529b65b2103193.tar.gz forums-f8124b2117bf3abce4671cd2aa529b65b2103193.tar.bz2 forums-f8124b2117bf3abce4671cd2aa529b65b2103193.tar.xz forums-f8124b2117bf3abce4671cd2aa529b65b2103193.zip | |
Allow forum notifications if topic notifications are disabled but forum notifications enabled - #14765
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8353 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c6afafe01a..0513ae1215 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -112,6 +112,7 @@ <li>[Fix] Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)</li> <li>[Fix] Tiny code fixes (Bug #20165, #20025, #19795, #14804)</li> <li>[Fix] Prepend phpbb_root_path to ranks path for displaying ranks (Bug #19075)</li> + <li>[Fix] Allow forum notifications if topic notifications are disabled but forum notifications enabled (Bug #14765)</li> </ul> <a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3> diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 2374029ae6..29dca090b7 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1111,7 +1111,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id trigger_error('WRONG_NOTIFICATION_MODE'); } - if (!$config['allow_topic_notify']) + if (($topic_notification && !$config['allow_topic_notify']) || ($forum_notification && !$config['allow_forum_notify'])) { return; } |