aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-09 14:50:06 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-09 14:50:06 +0100
commit7ab774bc8d34493306b94b06267b4c36aebffc22 (patch)
tree140e034afd403dd864870e08a5c99d6f70503207 /phpBB/viewtopic.php
parent10b628a20a6549452c117a8733629d8bdc909faf (diff)
parentced316d88c54af692044891e4e582847619d111b (diff)
downloadforums-7ab774bc8d34493306b94b06267b4c36aebffc22.tar
forums-7ab774bc8d34493306b94b06267b4c36aebffc22.tar.gz
forums-7ab774bc8d34493306b94b06267b4c36aebffc22.tar.bz2
forums-7ab774bc8d34493306b94b06267b4c36aebffc22.tar.xz
forums-7ab774bc8d34493306b94b06267b4c36aebffc22.zip
Merge pull request #3121 from Elsensee/ticket/13300
[ticket/13300] Don't show jabber in profile if jabber is disabled
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 7bedcdfb49..30beea337a 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1247,7 +1247,7 @@ while ($row = $db->sql_fetchrow($result))
'contact_user' => $user->lang('CONTACT_USER', get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['username'])),
'online' => false,
- 'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
+ 'jabber' => ($config['jab_enable'] && $row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
'search' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&amp;sr=posts") : '',
'author_full' => get_username_string('full', $poster_id, $row['username'], $row['user_colour']),