From aab2815d58ca956331eca1deaab66862ec0da253 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Wed, 20 Apr 2022 08:13:10 +0000 Subject: [PATCH] Media: Remove `attachment_fields_to_save` filter and deprecate `image_attachment_fields_to_save()`. This filter prevented removing attachment titles. This changeset removes the filter and deprecates the related function since it is no longer used. Props dromero20, desrosj, Junaidkbr, francina, antpb, audrasjb, aadilali, etaproducto, azouamauriac, Boniu91, SergeyBiryukov. Fixes #39108. Built from https://develop.svn.wordpress.org/trunk@53228 git-svn-id: http://core.svn.wordpress.org/trunk@52817 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/admin-filters.php | 2 -- wp-admin/includes/deprecated.php | 17 +++++++++++++++++ wp-admin/includes/media.php | 25 ------------------------- wp-includes/version.php | 2 +- 4 files changed, 18 insertions(+), 28 deletions(-) diff --git a/wp-admin/includes/admin-filters.php b/wp-admin/includes/admin-filters.php index d03881c8ac..078eca0093 100644 --- a/wp-admin/includes/admin-filters.php +++ b/wp-admin/includes/admin-filters.php @@ -31,8 +31,6 @@ add_filter( 'async_upload_audio', 'get_media_item', 10, 2 ); add_filter( 'async_upload_video', 'get_media_item', 10, 2 ); add_filter( 'async_upload_file', 'get_media_item', 10, 2 ); -add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 ); - add_filter( 'media_upload_gallery', 'media_upload_gallery' ); add_filter( 'media_upload_library', 'media_upload_library' ); diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index 5a932887d6..75f9bfd1bf 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -1567,3 +1567,20 @@ class WP_Privacy_Data_Removal_Requests_Table extends WP_Privacy_Data_Removal_Req function _wp_privacy_requests_screen_options() { _deprecated_function( __FUNCTION__, '5.3.0' ); } + +/** + * Was used to filter input from media_upload_form_handler() and to assign a default + * post_title from the file name if none supplied. + * + * @since 2.5.0 + * @deprecated 6.0.0 + * + * @param array $post The WP_Post attachment object converted to an array. + * @param array $attachment An array of attachment metadata. + * @return array Attachment post object converted to an array. + */ +function image_attachment_fields_to_save( $post, $attachment ) { + _deprecated_function( __FUNCTION__, '6.0.0' ); + + return $post; +} diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index b0c00e847b..ce89e7f94d 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1321,31 +1321,6 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { return $form_fields; } -/** - * Filters input from media_upload_form_handler() and assigns a default - * post_title from the file name if none supplied. - * - * Illustrates the use of the {@see 'attachment_fields_to_save'} filter - * which can be used to add default values to any field before saving to DB. - * - * @since 2.5.0 - * - * @param array $post The WP_Post attachment object converted to an array. - * @param array $attachment An array of attachment metadata. - * @return array Filtered attachment post object. - */ -function image_attachment_fields_to_save( $post, $attachment ) { - if ( 'image' === substr( $post['post_mime_type'], 0, 5 ) ) { - if ( strlen( trim( $post['post_title'] ) ) == 0 ) { - $attachment_url = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid']; - $post['post_title'] = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) ); - $post['errors']['post_title']['errors'][] = __( 'Empty Title filled from filename.' ); - } - } - - return $post; -} - /** * Retrieves the media element HTML to send to the editor. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 93670318a2..6091c7e801 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-beta2-53227'; +$wp_version = '6.0-beta2-53228'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.