diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-01-24 22:30:43 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2010-01-24 22:30:43 +0000 |
| commit | 7d6718630b0af4add7b2d0ecbb6e7640941dcab3 (patch) | |
| tree | 209eb39b6599e7db232311e8ec47b8ca7f9c0463 | |
| parent | 71366a2ad279a1bb941c0bfa80505c1c8deecf84 (diff) | |
| download | forums-7d6718630b0af4add7b2d0ecbb6e7640941dcab3.tar forums-7d6718630b0af4add7b2d0ecbb6e7640941dcab3.tar.gz forums-7d6718630b0af4add7b2d0ecbb6e7640941dcab3.tar.bz2 forums-7d6718630b0af4add7b2d0ecbb6e7640941dcab3.tar.xz forums-7d6718630b0af4add7b2d0ecbb6e7640941dcab3.zip | |
[Fix] Do not automatically unsubscribe users from topics, when email and jabber is disabled.
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10436 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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 e0e3c327db..da26ebd166 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -140,6 +140,7 @@ <li>[Fix] Clarify explanation of bump feature setting. (Bug #56075)</li> <li>[Fix] Properly paginate unapproved posts in the MCP. (Bug #56285)</li> <li>[Fix] Do not duplicate previous/next links in pagination text of moderator logs and user notes in MCP for subsilver2. (Bug #55045)</li> + <li>[Fix] [Fix] Do not automatically unsubscribe users from topics, when email and jabber is disabled.</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 5f72d8d899..0a31ea49a8 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2525,7 +2525,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u VALUES (' . $user->data['user_id'] . ', ' . $data['topic_id'] . ')'; $db->sql_query($sql); } - else if ($data['notify_set'] && !$data['notify']) + else if (($config['email_enable'] || $config['jab_enable']) && $data['notify_set'] && !$data['notify']) { $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE user_id = ' . $user->data['user_id'] . ' |