IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Media: Ensure 'media_handle_upload()' returns 'WP_Error' on failure.

Browse Source 
This fixes an issue where failures when inserting the attachment post via
`wp_insert_attachment()` would result in a return value of `0` instead of a
`WP_Error` object, as documented. This is addressed by passing `true` as the 
fourth param (added in WP 4.7.0) when calling `wp_insert_attachment()`.

Props mrasharirfan, flixos90.
Fixes #41726.

Built from https://develop.svn.wordpress.org/trunk@41323


git-svn-id: http://core.svn.wordpress.org/trunk@41154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Joe McGill
2017-08-30 15:04:48 +00:00
parent d611184f4f
commit 682ec35fbc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/media.php
View File

@@ -378,7 +378,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
unset( $attachment['ID'] ); unset( $attachment['ID'] );
// Save the data // Save the data
$id = wp_insert_attachment($attachment, $file, $post_id); $id = wp_insert_attachment( $attachment, $file, $post_id, true );
if ( !is_wp_error($id) ) { if ( !is_wp_error($id) ) {
wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
} }

2
wp-includes/version.php
View File

@@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41322'; $wp_version = '4.9-alpha-41323';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.