WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

Props dhanendran, gnif, sergey.
Merges [42695] and [42702] to the 4.9 branch.
Fixes #43255.


Built from https://develop.svn.wordpress.org/branches/4.9@43649


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mike Schroder 2018-09-18 22:02:28 +00:00
parent a5c8e5caa3
commit 47fdbd4add
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' ); $fp = fopen( $filename, 'w' );
if ( ! $fp ) if ( ! $fp ) {
ob_end_clean();
return false; return false;
}
fwrite( $fp, $contents ); fwrite( $fp, $contents );
fclose( $fp ); fclose( $fp );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.9-alpha-43648'; $wp_version = '4.9.9-alpha-43649';
/** /**
* 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.