diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-08 15:38:39 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-08 15:38:39 +0000 |
| commit | d79b43b4aa2f42068259f186eb098c461e8f2c09 (patch) | |
| tree | 6f1407c95b94e78883421ef8eff9031a395c0dfc | |
| parent | c5051472ded93350f71e601399dede8779cd7a06 (diff) | |
| download | forums-d79b43b4aa2f42068259f186eb098c461e8f2c09.tar forums-d79b43b4aa2f42068259f186eb098c461e8f2c09.tar.gz forums-d79b43b4aa2f42068259f186eb098c461e8f2c09.tar.bz2 forums-d79b43b4aa2f42068259f186eb098c461e8f2c09.tar.xz forums-d79b43b4aa2f42068259f186eb098c461e8f2c09.zip | |
#12263
git-svn-id: file:///svn/phpbb/trunk@7732 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c64443d1e6..a4e629bbaa 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -248,6 +248,7 @@ p a { <li>[Fix] Correctly propagate variables across the custom profile field wizard (Bug #12237)</li> <li>[Fix] Correctly move pm's into folders if more than one is received (Bug #12135)</li> <li>[Fix] Corrected various bugs with CPF on multi-language boards (Bug #11803)</li> + <li>[Fix] Disable notify checkbox in posting editor when board email is disabled (Bug #12263)</li> diff --git a/phpBB/posting.php b/phpBB/posting.php index 3ab5544198..512ea1e831 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1267,7 +1267,7 @@ $template->assign_vars(array( 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', 'S_SIG_ALLOWED' => ($auth->acl_get('f_sigs', $forum_id) && $config['allow_sig'] && $user->data['is_registered']) ? true : false, 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', - 'S_NOTIFY_ALLOWED' => (!$user->data['is_registered'] || ($mode == 'edit' && $user->data['user_id'] != $post_data['poster_id']) || !$config['allow_topic_notify']) ? false : true, + 'S_NOTIFY_ALLOWED' => (!$user->data['is_registered'] || ($mode == 'edit' && $user->data['user_id'] != $post_data['poster_id']) || !$config['allow_topic_notify'] || !$config['email_enable']) ? false : true, 'S_NOTIFY_CHECKED' => ($notify_checked) ? ' checked="checked"' : '', 'S_LOCK_TOPIC_ALLOWED' => (($mode == 'edit' || $mode == 'reply' || $mode == 'quote') && ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && !empty($post_data['topic_poster']) && $user->data['user_id'] == $post_data['topic_poster'] && $post_data['topic_status'] == ITEM_UNLOCKED))) ? true : false, 'S_LOCK_TOPIC_CHECKED' => ($lock_topic_checked) ? ' checked="checked"' : '', |