Skip to content

Commit e2442c0

Browse files
Users: Remove deprecated user contact methods.
The three default contact methods (AIM, Yahoo IM, Jabber) were removed for new installations in WordPress 3.6. This commit removes the remaining references from the codebase, as the associated services were discontinued quite a while ago. The `user_contactmethods` filter is available for adding or removing contact methods. Follow-up to [23588], [25606]. Props butterflymedia, birgire, Presskopp, yashjawale, SergeyBiryukov. Fixes #44374. Built from https://develop.svn.wordpress.org/trunk@60644 git-svn-id: http://core.svn.wordpress.org/trunk@59980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent db9f744 commit e2442c0

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

wp-includes/author-template.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,11 @@ function the_modified_author() {
124124
* Valid values for the `$field` parameter include:
125125
*
126126
* - admin_color
127-
* - aim
128127
* - comment_shortcuts
129128
* - description
130129
* - display_name
131130
* - first_name
132131
* - ID
133-
* - jabber
134132
* - last_name
135133
* - nickname
136134
* - plugins_last_view
@@ -149,9 +147,9 @@ function the_modified_author() {
149147
* - user_registered
150148
* - user_status
151149
* - user_url
152-
* - yim
153150
*
154151
* @since 2.8.0
152+
* @since 6.9.0 Removed `aim`, `jabber`, and `yim` as valid values for the `$field` parameter.
155153
*
156154
* @global WP_User $authordata The current author's data.
157155
*

wp-includes/user.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,22 +2953,19 @@ function _get_additional_user_keys( $user ) {
29532953
/**
29542954
* Sets up the user contact methods.
29552955
*
2956-
* Default contact methods were removed in 3.6. A filter dictates contact methods.
2956+
* Default contact methods were removed for new installations in WordPress 3.6
2957+
* and completely removed from the codebase in WordPress 6.9.
2958+
*
2959+
* Use the {@see 'user_contactmethods'} filter to add or remove contact methods.
29572960
*
29582961
* @since 3.7.0
2962+
* @since 6.9.0 Removed references to `aim`, `jabber`, and `yim` contact methods.
29592963
*
29602964
* @param WP_User|null $user Optional. WP_User object.
29612965
* @return string[] Array of contact method labels keyed by contact method.
29622966
*/
29632967
function wp_get_user_contact_methods( $user = null ) {
29642968
$methods = array();
2965-
if ( get_site_option( 'initial_db_version' ) < 23588 ) {
2966-
$methods = array(
2967-
'aim' => __( 'AIM' ),
2968-
'yim' => __( 'Yahoo IM' ),
2969-
'jabber' => __( 'Jabber / Google Talk' ),
2970-
);
2971-
}
29722969

29732970
/**
29742971
* Filters the user contact methods.

wp-includes/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '6.9-alpha-60643';
19+
$wp_version = '6.9-alpha-60644';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 commit comments

Comments
 (0)