Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-28 12:07:36 +01:00
Code Issues Projects Releases Wiki Activity

Media: In WP_Image_Editor::make_image(), close previously opened output buffer if the file could not be created.

Browse Source 
In addition to the merge noted below, includes important brackets added in [42343].

Props dhanendran, gnif, SergeyBiryukov.
Merges [42695] and [42702] to the 5.0 branch.
Fixes #43255.
Built from https://develop.svn.wordpress.org/branches/5.0@43717


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-10-11 08:11:23 +00:00
parent a6a20b29d8
commit b7de0935b9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-image-editor.php
View File

@ -406,8 +406,10 @@ abstract class WP_Image_Editor {
$fp = fopen( $filename, 'w' );
if ( ! $fp )
if ( ! $fp ) {
ob_end_clean();
return false;
}
fwrite( $fp, $contents );
fclose( $fp );

2
wp-includes/version.php
View File

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