mirror of
https://github.com/WordPress/WordPress.git
synced 2024-10-02 09:07:59 +02:00
Remove the three default contact methods (AIM, YIM, Jabber) for new installs. fixes #11541.
git-svn-id: http://core.svn.wordpress.org/trunk@23588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
becc1627d8
commit
3579814b3e
@ -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
|
* @since 2.9.0
|
||||||
* @access private
|
* @access private
|
||||||
@ -1536,10 +1538,13 @@ function _get_additional_user_keys( $user ) {
|
|||||||
* @return array $user_contactmethods Array of contact methods and their labels.
|
* @return array $user_contactmethods Array of contact methods and their labels.
|
||||||
*/
|
*/
|
||||||
function _wp_get_user_contactmethods( $user = null ) {
|
function _wp_get_user_contactmethods( $user = null ) {
|
||||||
|
$user_contactmethods = array();
|
||||||
|
if ( get_site_option( 'initial_db_version' ) < 23588 ) {
|
||||||
$user_contactmethods = array(
|
$user_contactmethods = array(
|
||||||
'aim' => __('AIM'),
|
'aim' => __( 'AIM' ),
|
||||||
'yim' => __('Yahoo IM'),
|
'yim' => __( 'Yahoo IM' ),
|
||||||
'jabber' => __('Jabber / Google Talk')
|
'jabber' => __( 'Jabber / Google Talk' )
|
||||||
);
|
);
|
||||||
|
}
|
||||||
return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
|
return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ $wp_version = '3.6-alpha-23585';
|
|||||||
*
|
*
|
||||||
* @global int $wp_db_version
|
* @global int $wp_db_version
|
||||||
*/
|
*/
|
||||||
$wp_db_version = 23524;
|
$wp_db_version = 23588;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the TinyMCE version
|
* Holds the TinyMCE version
|
||||||
|
Loading…
Reference in New Issue
Block a user