From 47fdbd4adde4b289ea1f8a5995a41ff2dde7eeb9 Mon Sep 17 00:00:00 2001 From: Mike Schroder Date: Tue, 18 Sep 2018 22:02:28 +0000 Subject: [PATCH] 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 --- wp-includes/class-wp-image-editor.php | 4 +++- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php index 85a4916117..62e1575a1d 100644 --- a/wp-includes/class-wp-image-editor.php +++ b/wp-includes/class-wp-image-editor.php @@ -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 ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 81775ffaa9..cfb33a1036 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @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.