diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-09 14:50:06 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-09 14:50:06 +0100 |
| commit | 7ab774bc8d34493306b94b06267b4c36aebffc22 (patch) | |
| tree | 140e034afd403dd864870e08a5c99d6f70503207 /phpBB/includes/ucp | |
| parent | 10b628a20a6549452c117a8733629d8bdc909faf (diff) | |
| parent | ced316d88c54af692044891e4e582847619d111b (diff) | |
| download | forums-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/includes/ucp')
| -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 b2dc962f57..888c2e6825 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -197,7 +197,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) $u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id); } - if ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) + if ($config['jab_enable'] && $user_info['user_jabber'] && $auth->acl_get('u_sendim')) { $u_jabber = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id); } |