From aac3ea45f38b313e9cb2efc36ac0b10ce5fc1c65 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sun, 9 Dec 2012 17:02:22 +0000 Subject: [PATCH] Only unset() after we have confirmed we are not dealing with a WP_Error. props DH-Shredder. fixes #22824. git-svn-id: http://core.svn.wordpress.org/trunk@23133 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-image-editor-gd.php | 5 +++-- wp-includes/class-wp-image-editor-imagick.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php index fd4d0a1205..b0781b572d 100644 --- a/wp-includes/class-wp-image-editor-gd.php +++ b/wp-includes/class-wp-image-editor-gd.php @@ -190,10 +190,11 @@ class WP_Image_Editor_GD extends WP_Image_Editor { $resized = $this->_save( $image ); imagedestroy( $image ); - unset( $resized['path'] ); - if ( ! is_wp_error( $resized ) && $resized ) + if ( ! is_wp_error( $resized ) && $resized ) { + unset( $resized['path'] ); $metadata[$size] = $resized; + } } $this->size = $orig_size; diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php index 179cadabb4..21e4e0cac3 100644 --- a/wp-includes/class-wp-image-editor-imagick.php +++ b/wp-includes/class-wp-image-editor-imagick.php @@ -268,10 +268,11 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { $this->image->clear(); $this->image->destroy(); $this->image = null; - unset( $resized['path'] ); - if ( ! is_wp_error( $resized ) && $resized ) + if ( ! is_wp_error( $resized ) && $resized ) { + unset( $resized['path'] ); $metadata[$size] = $resized; + } } $this->size = $orig_size;