aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2014-11-09 02:22:39 +0100
committerOliver Schramm <oliver.schramm97@gmail.com>2014-11-09 02:22:39 +0100
commitced316d88c54af692044891e4e582847619d111b (patch)
tree76eef88fee5c98d15c1e5e8412f255b534d22811 /phpBB/includes/functions_display.php
parent101945acf98b7fb765a90288bc7dd403ee610dd5 (diff)
downloadforums-ced316d88c54af692044891e4e582847619d111b.tar
forums-ced316d88c54af692044891e4e582847619d111b.tar.gz
forums-ced316d88c54af692044891e4e582847619d111b.tar.bz2
forums-ced316d88c54af692044891e4e582847619d111b.tar.xz
forums-ced316d88c54af692044891e4e582847619d111b.zip
[ticket/13300] Don't show jabber in profile if jabber is disabled
PHPBB3-13300
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 48c34ecfe6..31cf43e599 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1608,8 +1608,8 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl
'U_EMAIL' => $email,
'U_JABBER' => ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '',
- 'USER_JABBER' => $data['user_jabber'],
- 'USER_JABBER_IMG' => ($data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '',
+ 'USER_JABBER' => ($config['jab_enable']) ? $data['user_jabber'] : '',
+ 'USER_JABBER_IMG' => ($config['jab_enable'] && $data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '',
'L_SEND_EMAIL_USER' => $user->lang('SEND_EMAIL_USER', $username),
'L_CONTACT_USER' => $user->lang('CONTACT_USER', $username),