Changeset 23588

Timestamp:

03/03/2013 03:00:34 AM (12 years ago)

Author:

nacin

Message:

Remove the three default contact methods (AIM, YIM, Jabber) for new installs. fixes #11541.

Location:

trunk/wp-includes

Files:

• user.php (modified) (2 diffs)
• version.php (modified) (1 diff)

trunk/wp-includes/user.php

@@ -1528 +1528 @@
 
 /**
- * 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
@@ -1537 +1539 @@
  */
 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 );
 }

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 23524;
+$wp_db_version = 23588;
 
 /**