diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:24:55 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:24:55 +0200 |
| commit | 3c02a1cff70641ae3f5276863242452b6ab06092 (patch) | |
| tree | ad644c18a3481c07ddf5bd60a98e36e1d055baff /phpBB/includes | |
| parent | cd46b399678db9f7a10f6395b2920135800c41fd (diff) | |
| parent | 2a59e6d4864a993842167a40a9762702ad58db12 (diff) | |
| download | forums-3c02a1cff70641ae3f5276863242452b6ab06092.tar forums-3c02a1cff70641ae3f5276863242452b6ab06092.tar.gz forums-3c02a1cff70641ae3f5276863242452b6ab06092.tar.bz2 forums-3c02a1cff70641ae3f5276863242452b6ab06092.tar.xz forums-3c02a1cff70641ae3f5276863242452b6ab06092.zip | |
Merge branch 'ticket/jellydoughnut/9772' into develop-olympus
* ticket/jellydoughnut/9772:
[ticket/9772] Unify permissions for sending email when board_email_form is off
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 26968e1382..16700c490c 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -309,7 +309,7 @@ function get_user_information($user_id, $user_row) get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']); - if (!empty($user_row['user_allow_viewemail']) || $auth->acl_get('a_email')) + if ((!empty($user_row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email')) { $user_row['email'] = ($config['board_email_form'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&u=$user_id") : ((($config['board_hide_emails'] && !$auth->acl_get('a_email')) || empty($user_row['user_email'])) ? '' : 'mailto:' . $user_row['user_email']); } |