diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 7b502e91c8..c031b01788 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -373,120 +373,6 @@ switch ($mode)
);
break;
- case 'contact':
-
- $page_title = $user->lang['IM_USER'];
- $template_html = 'memberlist_im.html';
-
- if (!$auth->acl_get('u_sendim'))
- {
- send_status_line(403, 'Forbidden');
- trigger_error('NOT_AUTHORISED');
- }
-
- $presence_img = '';
- switch ($action)
- {
- case 'jabber':
- $lang = 'JABBER';
- $sql_field = 'user_jabber';
- $s_select = (@extension_loaded('xml') && $config['jab_enable']) ? 'S_SEND_JABBER' : 'S_NO_SEND_JABBER';
- $s_action = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id");
- break;
-
- default:
- trigger_error('NO_MODE', E_USER_ERROR);
- break;
- }
-
- // Grab relevant data
- $sql = "SELECT user_id, username, user_email, user_lang, $sql_field
- FROM " . USERS_TABLE . "
- WHERE user_id = $user_id
- AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
- $result = $db->sql_query($sql);
- $row = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
-
- if (!$row)
- {
- trigger_error('NO_USER');
- }
- else if (empty($row[$sql_field]))
- {
- trigger_error('IM_NO_DATA');
- }
-
- // Post data grab actions
- switch ($action)
- {
- case 'jabber':
- add_form_key('memberlist_messaging');
-
- if ($submit && @extension_loaded('xml') && $config['jab_enable'])
- {
- if (check_form_key('memberlist_messaging'))
- {
-
- $subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']);
- $message = $request->variable('message', '', true);
-
- if (empty($message))
- {
- trigger_error('EMPTY_MESSAGE_IM');
- }
-
- $jabber = $phpbb_container->get('messenger.method.jabber');
- $jabber->set_use_queue(false);
-
- $jabber->template('profile_send_im', $row['user_lang']);
- $jabber->subject(html_entity_decode($subject, ENT_COMPAT));
- $jabber->set_addresses($row);
-
- $jabber->assign_vars([
- 'BOARD_CONTACT' => phpbb_get_board_contact($config, $phpEx),
- 'FROM_USERNAME' => html_entity_decode($user->data['username'], ENT_COMPAT),
- 'TO_USERNAME' => html_entity_decode($row['username'], ENT_COMPAT),
- 'MESSAGE' => html_entity_decode($message, ENT_COMPAT),
- ]);
-
- $jabber->send();
-
- $s_select = 'S_SENT_JABBER';
- }
- else
- {
- trigger_error('FORM_INVALID');
- }
- }
- break;
- }
-
- $template->assign_block_vars('navlinks', array(
- 'BREADCRUMB_NAME' => $page_title,
- 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"),
- ));
-
- // Send vars to the template
- $template->assign_vars(array(
- 'IM_CONTACT' => $row[$sql_field],
- 'A_IM_CONTACT' => addslashes($row[$sql_field]),
-
- 'USERNAME' => $row['username'],
- 'CONTACT_NAME' => $row[$sql_field],
- 'SITENAME' => $config['sitename'],
-
- 'PRESENCE_IMG' => $presence_img,
-
- 'L_SEND_IM_EXPLAIN' => $user->lang['IM_' . $lang],
- 'L_IM_SENT_JABBER' => sprintf($user->lang['IM_SENT_JABBER'], $row['username']),
-
- $s_select => true,
- 'S_IM_ACTION' => $s_action)
- );
-
- break;
-
case 'viewprofile':
// Display a profile
if ($user_id == ANONYMOUS && !$username)
@@ -950,8 +836,8 @@ switch ($mode)
{
// Generate the navlinks based on the selected topic
$navlinks_sql_array = [
- 'SELECT' => 'f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name,
- f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options,
+ 'SELECT' => 'f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name,
+ f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options,
f.forum_options, t.topic_title',
'FROM' => [
FORUMS_TABLE => 'f',
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
deleted file mode 100644
index f91454aacb..0000000000
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-{L_SEND_IM}
-
-
-
-{L_CLOSE_WINDOW}
-
-