6 files changed, 10 insertions, 98 deletions
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index 35b1e6bdcb..0fcd139ae1 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -2,8 +2,6 @@
 
 <br clear="all" />
 
-<!-- MSNM info from http://www.cdolive.net/ - doesn't seem to work with MSN Messenger -->
-
 <form method="post" action="{S_IM_ACTION}">
 	<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
 	<tr>
@@ -14,7 +12,7 @@
 	</tr>
 	<tr>
 		<td class="row1"><b class="genmed">{L_IM_RECIPIENT}{L_COLON} </b></td>
-		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_AIM or S_SEND_MSNM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
+		<td class="row2"><span class="gen"><b>{USERNAME}</b><!-- IF S_SEND_AIM or S_NO_SEND_JABBER --> [ {IM_CONTACT} ]<!-- ENDIF --></span> <!-- IF PRESENCE_IMG -->{PRESENCE_IMG}<!-- ENDIF --></td>
 	</tr>
 
 	<!-- IF S_SEND_AIM -->
@@ -26,85 +24,6 @@
 		</tr>
 	<!-- ENDIF -->
 
-	<!-- IF S_SEND_MSNM -->
-		<tr>
-			<td class="row1" colspan="2" align="center">
-				<object classid="clsid:B69003B3-C55E-4B48-836C-BC5946FC3B28" codetype="application/x-oleobject" id="objMessengerApp" width="0" height="0"></object>
-				<script type="text/javascript">
-				// <![CDATA[
-					var app = document.getElementById('objMessengerApp');
-					
-					/**
-					* Check whether the browser supports this and whether MSNM is connected
-					*/
-					function msn_supported()
-					{
-						// Does the browser support the MSNM object?
-						if (app.MyStatus) 
-						{
-							// Is MSNM connected?
-							if (app.MyStatus == 1)
-							{
-								alert('{LA_IM_MSNM_CONNECT}');
-								return false;
-							}
-						}
-						else
-						{
-							alert('{LA_IM_MSNM_BROWSER}');
-							return false;
-						}
-						return true;
-					}
-
-					/**
-					* Add to your contact list
-					*/
-					function add_contact(address)
-					{
-						if (msn_supported())
-						{
-							// Could return an error while MSNM is connecting, don't want that
-							try
-							{
-								app.AddContact(0, address);
-							}
-							catch (e)
-							{
-								return;
-							}
-						}
-					}
-
-					/**
-					* Write IM to contact
-					*/
-					function im_contact(address)
-					{
-						if (msn_supported())
-						{
-							// Could return an error while MSNM is connecting, don't want that
-							try
-							{
-								app.InstantMessage(address);
-							}
-							catch (e)
-							{
-								return;
-							}
-						}
-					}
-				// ]]>
-				</script>
-	
-				<a class="gen" href="#" onclick="add_contact('{A_IM_CONTACT}'); return false;">{L_IM_ADD_CONTACT}</a><br /><a class="gen" href="#" onclick="im_contact('{A_IM_CONTACT}'); return false;">{L_IM_SEND_MESSAGE}</a>
-			</td>
-		</tr>
-		<tr>
-			<td class="cat" colspan="2" align="center">&nbsp;</td>
-		</tr>
-	<!-- ENDIF -->
-
 	<!-- IF S_SEND_JABBER -->
 		<tr>
 			<td class="row1"><b class="genmed">{L_IM_MESSAGE}{L_COLON} </b></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index a0d46bf670..251230b643 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -94,16 +94,13 @@
 	<td class="row1"><b class="genmed">{L_YIM}{L_COLON}</b></td>
 	<td class="row2"><input class="post" type="text" name="yahoo" value="{YAHOO}" /></td>
 </tr>
-<tr>
 <!-- IF S_VIEWONLINE -->
+<tr>
 	<td class="row1"><b class="genmed">{L_LAST_ACTIVE}{L_COLON}</b></td>
 	<td class="row2"><select name="active_select">{S_ACTIVE_TIME_OPTIONS}</select> <input class="post" type="text" name="active" value="{ACTIVE}" /></td>
-<!-- ELSE -->
 	<td colspan="2" class="row1">&nbsp;</td>
-<!-- ENDIF -->
-	<td class="row1"><b class="genmed">{L_MSNM}{L_COLON}</b></td>
-	<td class="row2"><input class="post" type="text" name="msn" value="{MSNM}" /></td>
 </tr>
+<!-- ENDIF -->
 <tr>
 	<td class="row1"><b class="genmed">{L_POSTS}{L_COLON}</b></td>
 	<td class="row2"><select name="count_select">{S_COUNT_OPTIONS}</select> <input class="post" type="number" min="0" name="count" value="{COUNT}" /></td>
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html
index 064fdc5dec..9c84fedd89 100644
--- a/phpBB/styles/subsilver2/template/memberlist_view.html
+++ b/phpBB/styles/subsilver2/template/memberlist_view.html
@@ -119,10 +119,6 @@
 				</tr>
 			<!-- ENDIF -->
 			<tr>
-				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_MSNM}{L_COLON} </td>
-				<td><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false" class="imageset">{MSN_IMG}</a><!-- ELSEIF USER_MSN -->{USER_MSN}<!-- ENDIF --></td>
-			</tr>
-			<tr>
 				<td class="gen" nowrap="nowrap" align="{S_CONTENT_FLOW_END}">{L_YIM}{L_COLON} </td>
 				<td><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false" class="imageset">{YIM_IMG}</a><!-- ELSEIF USER_YIM -->{USER_YIM}<!-- ENDIF --></td>
 			</tr>
@@ -138,7 +134,11 @@
 				<!-- IF custom_fields.S_PROFILE_CONTACT -->
 				<tr>
 					<td class="gen" align="{S_CONTENT_FLOW_END}" nowrap="nowrap">{custom_fields.PROFILE_FIELD_NAME}{L_COLON} </td>
-					<td><a href="{custom_fields.PROFILE_FIELD_CONTACT}"><span class="imageset {custom_fields.PROFILE_FIELD_IDENT}-icon">{custom_fields.PROFILE_FIELD_DESC}</span></a></td>
+					<!-- IF custom_fields.PROFILE_FIELD_CONTACT -->
+						<td><a href="{custom_fields.PROFILE_FIELD_CONTACT}"><span class="imageset {custom_fields.PROFILE_FIELD_IDENT}-icon">{custom_fields.PROFILE_FIELD_DESC}</span></a></td>
+					<!-- ELSE -->
+						<td><b class="genmed">{custom_fields.PROFILE_FIELD_VALUE}</b></td>
+					<!-- ENDIF -->
 				</tr>
 				<!-- ENDIF -->
 			<!-- END custom_fields -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
index e270542231..877c9fe1ab 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
@@ -17,10 +17,6 @@
 	<td class="row2"><input class="post" type="text" name="aim" size="30" maxlength="255" value="{AIM}" /></td>
 </tr>
 <tr>
-	<td class="row1" width="35%"><b class="genmed">{L_UCP_MSNM}{L_COLON} </b></td>
-	<td class="row2"><input class="post" type="email" name="msn" size="30" maxlength="255" value="{MSN}" /></td>
-</tr>
-<tr>
 	<td class="row1" width="35%"><b class="genmed">{L_UCP_YIM}{L_COLON} </b></td>
 	<td class="row2"><input class="post" type="email" name="yim" size="30" maxlength="255" value="{YIM}" /></td>
 </tr>
diff --git a/phpBB/styles/subsilver2/theme/en/stylesheet.css b/phpBB/styles/subsilver2/theme/en/stylesheet.css
index e39a13ae18..449fe7bec5 100644
--- a/phpBB/styles/subsilver2/theme/en/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/en/stylesheet.css
@@ -19,7 +19,7 @@
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_msnm {
+.imageset.phpbb_wlm-icon, .imageset.icon_contact_msnm {
 	background-image: url("./icon_contact_msnm.gif");
 	padding-left: 72px;
 	padding-top: 20px;
diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css
index 94c6abeada..936625a0cf 100644
--- a/phpBB/styles/subsilver2/theme/stylesheet.css
+++ b/phpBB/styles/subsilver2/theme/stylesheet.css
@@ -1033,7 +1033,7 @@ a.imageset {
 	padding-left: 72px;
 	padding-top: 20px;
 }
-.imageset.icon_contact_msnm {
+.imageset.phpbb_wlm-icon, .imageset.icon_contact_msnm {
 	background-image: url("./en/icon_contact_msnm.gif");
 	padding-left: 72px;
 	padding-top: 20px;