diff --git a/src/wp-includes/author-template.php b/src/wp-includes/author-template.php index a48a6d3e6ec49..991b5e6050e2f 100644 --- a/src/wp-includes/author-template.php +++ b/src/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,7 +147,6 @@ function the_modified_author() { * - user_registered * - user_status * - user_url - * - yim * * @since 2.8.0 * diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php index eab8fa7e00565..94eef6adbb8bf 100644 --- a/src/wp-includes/user.php +++ b/src/wp-includes/user.php @@ -2140,6 +2140,7 @@ function validate_username( $username ) { * @since 2.0.0 * @since 3.6.0 The `aim`, `jabber`, and `yim` fields were removed as default user contact * methods for new installations. See wp_get_user_contact_methods(). + * @since 6.8.0 The `aim`, `jabber`, and `yim` fields were completely removed. * @since 4.7.0 The `locale` field can be passed to `$userdata`. * @since 5.3.0 The `user_activation_key` field can be passed to `$userdata`. * @since 5.3.0 The `spam` field can be passed to `$userdata` (Multisite only). @@ -2954,13 +2955,6 @@ function _get_additional_user_keys( $user ) { */ 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/tests/phpunit/tests/xmlrpc/wp/getUser.php b/tests/phpunit/tests/xmlrpc/wp/getUser.php index 391ec7157cee9..c9392bb1ce312 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getUser.php +++ b/tests/phpunit/tests/xmlrpc/wp/getUser.php @@ -60,7 +60,6 @@ public function test_valid_user() { 'display_name' => 'First Last', 'user_url' => 'http://www.example.com/testuser', 'role' => 'author', - 'aim' => 'wordpress', 'user_registered' => date_format( date_create( "@{$registered_date}" ), 'Y-m-d H:i:s' ), ); $user_id = wp_insert_user( $user_data );