1 files changed, 1 insertions, 82 deletions
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index da1ad661c3..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_ICQ or 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>