From 54d13789fe53f445334dbd1c18bfe7169b6772da Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 7 Sep 2020 13:05:15 +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. git-svn-id: https://develop.svn.wordpress.org/branches/5.5@48956 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/ajax-actions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php index 85996d2676..09fa49cb94 100644 --- a/src/wp-admin/includes/ajax-actions.php +++ b/src/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,