WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Andrew Nacin 2013-03-03 03:00:34 +00:00
parent becc1627d8
commit 3579814b3e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-includes/user.php
View File

@ -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 );
}

2
wp-includes/version.php
View File

@ -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