Use correct array key for filling the attachment title in image_attachment_fields_to_save(). props pross.

Use wp_basename() to avoid issues with UTF-8 characters.
fixes #25236.
Built from https://develop.svn.wordpress.org/trunk@25277


git-svn-id: http://core.svn.wordpress.org/trunk@25242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2013-09-06 14:10:09 +00:00
parent 14308c0d41
commit 897ddbd76c

View File

@ -914,18 +914,19 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
* @param array $attachment {@internal $attachment not used}} * @param array $attachment {@internal $attachment not used}}
* @return array * @return array
*/ */
function image_attachment_fields_to_save($post, $attachment) { function image_attachment_fields_to_save( $post, $attachment ) {
if ( substr($post['post_mime_type'], 0, 5) == 'image' ) { if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) {
if ( strlen(trim($post['post_title'])) == 0 ) { if ( strlen( trim( $post['post_title'] ) ) == 0 ) {
$post['post_title'] = preg_replace('/\.\w+$/', '', basename($post['guid'])); $attachment_url = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
$post['errors']['post_title']['errors'][] = __('Empty Title filled from filename.'); $post['post_title'] = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
$post['errors']['post_title']['errors'][] = __( 'Empty Title filled from filename.' );
} }
} }
return $post; return $post;
} }
add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2); add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
/** /**
* {@internal Missing Short Description}} * {@internal Missing Short Description}}