Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-25 13:52:59 +02:00
Code Issues Projects Releases Wiki Activity

Media: In wp_ajax_image_editor(), check if the error property exists before accessing it.

Browse Source 
This avoids a PHP notice when editing an image.

Follow-up to [48375].

Props Mista-Flo.
Fixes #51251.
Built from https://develop.svn.wordpress.org/trunk@48946


git-svn-id: http://core.svn.wordpress.org/trunk@48708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-09-05 18:12:08 +00:00
parent f43ca27db9
commit 93b8183327
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/ajax-actions.php
View File

@ -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,

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6-alpha-48945';
$wp_version = '5.6-alpha-48946';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.