aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-01-21 19:20:26 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-01-21 19:20:26 +0000
commite4be0ca79951d9ee13d85504d1c9d16391389f63 (patch)
tree78ec3604a3142ca58aa9f0d0406035565cd6f28f /phpBB/viewtopic.php
parent1438067953f4a6b7fd99f40391febe150cd39534 (diff)
downloadforums-e4be0ca79951d9ee13d85504d1c9d16391389f63.tar
forums-e4be0ca79951d9ee13d85504d1c9d16391389f63.tar.gz
forums-e4be0ca79951d9ee13d85504d1c9d16391389f63.tar.bz2
forums-e4be0ca79951d9ee13d85504d1c9d16391389f63.tar.xz
forums-e4be0ca79951d9ee13d85504d1c9d16391389f63.zip
- removed unnecessary pm options
- added one option to clearly define email visibility git-svn-id: file:///svn/phpbb/trunk@5071 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index cac180d3cf..69e183d0e6 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -933,7 +933,7 @@ while ($row = $db->sql_fetchrow($result))
if (!empty($row['user_allow_viewemail']) || $auth->acl_get('a_email'))
{
- $user_cache[$poster_id]['email'] = ($config['board_email_form'] && $config['email_enable']) ? "memberlist.$phpEx$SID&amp;mode=email&amp;u=" . $poster_id : 'mailto:' . $row['user_email'];
+ $user_cache[$poster_id]['email'] = ($config['board_email_form'] && $config['email_enable']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=email&amp;u=$poster_id" : (($config['board_hide_emails'] && !$auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
}
else
{