diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-08-28 23:34:18 +0200 |
| commit | e4ff780c1370d9f743da0fffc70b98be0c7cfe92 (patch) | |
| tree | 00738becf05268632411007a93ff06407ca1917a /phpBB/viewtopic.php | |
| parent | c4a65a469709a8ffdeb52f9d3556545993f2347a (diff) | |
| parent | dbe8fb6488005c3295f839c7302a56f1de872426 (diff) | |
| download | forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.gz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.bz2 forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.tar.xz forums-e4ff780c1370d9f743da0fffc70b98be0c7cfe92.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9117] Wrong redirection after login.
[ticket/9772] Unify permissions for sending email when board_email_form is off
[ticket/7369] CPF date should always render the users selection.
[ticket/7296] Exporting styles to tar creates corrupted archives.
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
[ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 8926d5a40b..498088c5c8 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1146,7 +1146,7 @@ while ($row = $db->sql_fetchrow($result)) get_user_rank($row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']); - if (!empty($row['user_allow_viewemail']) || $auth->acl_get('a_email')) + if ((!empty($row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email')) { $user_cache[$poster_id]['email'] = ($config['board_email_form'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&u=$poster_id") : (($config['board_hide_emails'] && !$auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']); } |