From a4b9563038b20caed6337015f6a2ca763c0377cb Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 7 Sep 2020 13:07:03 +0000
Subject: [PATCH] Media: In `wp_ajax_image_editor()`, check if the `error`
 property exists before accessing it.

This avoids a PHP notice when editing an image.

Follow-up to [48375].

Props Mista-Flo.
Merges [48946] to the 5.5 branch.
Fixes #51251.
Built from https://develop.svn.wordpress.org/branches/5.5@48956


git-svn-id: http://core.svn.wordpress.org/branches/5.5@48718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ajax-actions.php | 5 +++--
 wp-includes/version.php            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index 85996d2676..09fa49cb94 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -2604,10 +2604,11 @@ function wp_ajax_image_editor() {
 	include_once ABSPATH . 'wp-admin/includes/image-edit.php';
 
 	$msg = false;
+
 	switch ( $_POST['do'] ) {
 		case 'save':
 			$msg = wp_save_image( $attachment_id );
-			if ( $msg->error ) {
+			if ( ! empty( $msg->error ) ) {
 				wp_send_json_error( $msg );
 			}
 
@@ -2625,7 +2626,7 @@ function wp_ajax_image_editor() {
 	wp_image_editor( $attachment_id, $msg );
 	$html = ob_get_clean();
 
-	if ( $msg->error ) {
+	if ( ! empty( $msg->error ) ) {
 		wp_send_json_error(
 			array(
 				'message' => $msg,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 73a595f6a7..8a718a68b8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5.2-alpha-48955';
+$wp_version = '5.5.2-alpha-48956';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.