From 16d1aa3485ad95478e36e3a6d87a6874292822fe Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Sun, 3 Mar 2013 03:00:34 +0000
Subject: [PATCH] Remove the three default contact methods (AIM, YIM, Jabber)
 for new installs. fixes #11541.

git-svn-id: https://develop.svn.wordpress.org/trunk@23588 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/user.php    | 17 +++++++++++------
 wp-includes/version.php |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index ddca3703c0..9ecf8db93c 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -1527,7 +1527,9 @@ function _get_additional_user_keys( $user ) {
 }
 
 /**
- * Set up the default contact methods.
+ * Set up the contact methods.
+ *
+ * Default contact methods were removed in 3.6. A filter dictates contact methods.
  *
  * @since 2.9.0
  * @access private
@@ -1536,10 +1538,13 @@ function _get_additional_user_keys( $user ) {
  * @return array $user_contactmethods Array of contact methods and their labels.
  */
 function _wp_get_user_contactmethods( $user = null ) {
-	$user_contactmethods = array(
-		'aim' => __('AIM'),
-		'yim' => __('Yahoo IM'),
-		'jabber' => __('Jabber / Google Talk')
-	);
+	$user_contactmethods = array();
+	if ( get_site_option( 'initial_db_version' ) < 23588 ) {
+		$user_contactmethods = array(
+			'aim'    => __( 'AIM' ),
+			'yim'    => __( 'Yahoo IM' ),
+			'jabber' => __( 'Jabber / Google Talk' )
+		);
+	}
 	return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 37fb3d9c50..21124ab6d3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -11,7 +11,7 @@ $wp_version = '3.6-alpha-23585';
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 23524;
+$wp_db_version = 23588;
 
 /**
  * Holds the TinyMCE version