diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-09 14:50:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-09 14:50:15 +0100 |
| commit | e29eece45f22c5a6c8134e797604f1dee739fb57 (patch) | |
| tree | d71894be1476bea6619cfa1d529b5db5daed184a /phpBB/viewtopic.php | |
| parent | e603451b2fbe0a829358809b4baed97d0013a223 (diff) | |
| parent | 7ab774bc8d34493306b94b06267b4c36aebffc22 (diff) | |
| download | forums-e29eece45f22c5a6c8134e797604f1dee739fb57.tar forums-e29eece45f22c5a6c8134e797604f1dee739fb57.tar.gz forums-e29eece45f22c5a6c8134e797604f1dee739fb57.tar.bz2 forums-e29eece45f22c5a6c8134e797604f1dee739fb57.tar.xz forums-e29eece45f22c5a6c8134e797604f1dee739fb57.zip | |
Merge branch 'develop-ascraeus' into develop
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 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&action=jabber&u=$poster_id") : '', + 'jabber' => ($config['jab_enable'] && $row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '', 'search' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&sr=posts") : '', 'author_full' => get_username_string('full', $poster_id, $row['username'], $row['user_colour']), |