WordPress.org

Make WordPress Core

Changeset 23588


Ignore:
Timestamp:
03/03/13 03:00:34 (14 months ago)
Author:
nacin
Message:

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

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/user.php

    r23579 r23588  
    15281528 
    15291529/** 
    1530  * Set up the default contact methods. 
     1530 * Set up the contact methods. 
     1531 * 
     1532 * Default contact methods were removed in 3.6. A filter dictates contact methods. 
    15311533 * 
    15321534 * @since 2.9.0 
     
    15371539 */ 
    15381540function _wp_get_user_contactmethods( $user = null ) { 
    1539     $user_contactmethods = array( 
    1540         'aim' => __('AIM'), 
    1541         'yim' => __('Yahoo IM'), 
    1542         'jabber' => __('Jabber / Google Talk') 
    1543     ); 
     1541    $user_contactmethods = array(); 
     1542    if ( get_site_option( 'initial_db_version' ) < 23588 ) { 
     1543        $user_contactmethods = array( 
     1544            'aim'    => __( 'AIM' ), 
     1545            'yim'    => __( 'Yahoo IM' ), 
     1546            'jabber' => __( 'Jabber / Google Talk' ) 
     1547        ); 
     1548    } 
    15441549    return apply_filters( 'user_contactmethods', $user_contactmethods, $user ); 
    15451550} 
  • trunk/wp-includes/version.php

    r23585 r23588  
    1212 * @global int $wp_db_version 
    1313 */ 
    14 $wp_db_version = 23524; 
     14$wp_db_version = 23588; 
    1515 
    1616/** 
Note: See TracChangeset for help on using the changeset viewer.