diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php index a48a6d3e6e..a847fdcc16 100644 --- a/wp-includes/author-template.php +++ b/wp-includes/author-template.php @@ -124,13 +124,11 @@ function the_modified_author() { * Valid values for the `$field` parameter include: * * - admin_color - * - aim * - comment_shortcuts * - description * - display_name * - first_name * - ID - * - jabber * - last_name * - nickname * - plugins_last_view @@ -149,9 +147,9 @@ function the_modified_author() { * - user_registered * - user_status * - user_url - * - yim * * @since 2.8.0 + * @since 6.9.0 Removed `aim`, `jabber`, and `yim` as valid values for the `$field` parameter. * * @global WP_User $authordata The current author's data. * diff --git a/wp-includes/user.php b/wp-includes/user.php index 9cdfd59597..fd30be2ed0 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -2953,22 +2953,19 @@ function _get_additional_user_keys( $user ) { /** * Sets up the user contact methods. * - * Default contact methods were removed in 3.6. A filter dictates contact methods. + * Default contact methods were removed for new installations in WordPress 3.6 + * and completely removed from the codebase in WordPress 6.9. + * + * Use the {@see 'user_contactmethods'} filter to add or remove contact methods. * * @since 3.7.0 + * @since 6.9.0 Removed references to `aim`, `jabber`, and `yim` contact methods. * * @param WP_User|null $user Optional. WP_User object. * @return string[] Array of contact method labels keyed by contact method. */ function wp_get_user_contact_methods( $user = null ) { $methods = array(); - if ( get_site_option( 'initial_db_version' ) < 23588 ) { - $methods = array( - 'aim' => __( 'AIM' ), - 'yim' => __( 'Yahoo IM' ), - 'jabber' => __( 'Jabber / Google Talk' ), - ); - } /** * Filters the user contact methods. diff --git a/wp-includes/version.php b/wp-includes/version.php index b6f0b91657..4bdbf329af 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.9-alpha-60643'; +$wp_version = '6.9-alpha-60644'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.