<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56400] trunk/src/wp-admin/includes/image-edit.php: Coding Standards: Use strict comparison in `wp-admin/includes/image-edit.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56400">56400</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56400","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-08-16 14:03:44 +0000 (Wed, 16 Aug 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use strict comparison in `wp-admin/includes/image-edit.php`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/11911">[11911]</a>, <a href="https://core.trac.wordpress.org/changeset/11965">[11965]</a>, <a href="https://core.trac.wordpress.org/changeset/11984">[11984]</a>, <a href="https://core.trac.wordpress.org/changeset/12155">[12155]</a>, <a href="https://core.trac.wordpress.org/changeset/12163">[12163]</a>, <a href="https://core.trac.wordpress.org/changeset/22094">[22094]</a>.
Props aristath, poena, afercia, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/58831">#58831</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2023-08-16 08:46:22 UTC (rev 56399)
+++ trunk/src/wp-admin/includes/image-edit.php 2023-08-16 14:03:44 UTC (rev 56400)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,6 +636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $obj->sel = $obj->c;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $obj->c );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $changes[ $key ] = $obj;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,9 +643,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Combine operations.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $changes ) > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered = array( $changes[0] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $combined = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $filtered[ $i ]->type == $changes[ $j ]->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $filtered[ $i ]->type === $changes[ $j ]->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $filtered[ $i ]->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rotate':
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered[ $i ]->angle += $changes[ $j ]->angle;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,10 +659,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $combined ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered[ ++$i ] = $changes[ $j ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $changes = $filtered;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $filtered );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -693,7 +698,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $changes as $operation ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $operation->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rotate':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 != $operation->angle ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 !== $operation->angle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $image instanceof WP_Image_Editor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image->rotate( $operation->angle );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -702,11 +707,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'flip':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 != $operation->axis ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 !== $operation->axis ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $image instanceof WP_Image_Editor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image->flip( ( $operation->axis & 1 ) !== 0, ( $operation->axis & 2 ) !== 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image = _flip_image_resource( $image, ( $operation->axis & 1 ) !== 0, ( $operation->axis & 2 ) !== 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,9 +806,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $backup_sizes['full-orig'] ) && is_array( $backup_sizes['full-orig'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $backup_sizes['full-orig'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parts['basename'] != $data['file'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parts['basename'] !== $data['file'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Delete only if it's an edited image.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/-e[0-9]{13}\./', $parts['basename'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_file( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,9 +832,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $default_sizes as $default_size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $backup_sizes[ "$default_size-orig" ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $backup_sizes[ "$default_size-orig" ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] != $data['file'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] !== $data['file'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Delete only if it's an edited image.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/-e[0-9]{13}-/', $meta['sizes'][ $default_size ]['file'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_file = path_join( $parts['dirname'], $meta['sizes'][ $default_size ]['file'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -847,9 +851,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
- ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_update_attachment_metadata( $post_id, $meta )
+ || ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $msg->error = __( 'Cannot save image metadata.' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $msg;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,6 +862,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $msg->error = __( 'Image metadata is inconsistent.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $msg->msg = __( 'Image restored successfully.' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_wp_attachment_backup_sizes' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,6 +891,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $img ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return->error = esc_js( __( 'Unable to create new image.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,8 +961,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = pathinfo( $path, PATHINFO_FILENAME );
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix = time() . rand( 100, 999 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE &&
- isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE
+ && isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] !== $basename
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $edit_thumbnails_separately && 'thumbnail' === $target ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_path = "{$dirname}/{$filename}-temp.{$ext}";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,6 +976,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename .= "-e{$suffix}";
</span><span class="cx" style="display: block; padding: 0 10px"> $new_filename = "{$filename}.{$ext}";
</span><span class="cx" style="display: block; padding: 0 10px"> $new_path = "{$dirname}/$new_filename";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $new_path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix++;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,8 +993,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'nothumb' === $target || 'all' === $target || 'full' === $target || $scaled ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $backup_sizes['full-orig'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] !== $basename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE )
+ && $backup_sizes['full-orig']['file'] !== $basename
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = "full-$suffix";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1000,6 +1011,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'file' => $basename,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['file'] = _wp_relative_upload_path( $new_path );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,9 +1057,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sizes as $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $meta['sizes'][ $size ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $backup_sizes[ "$size-orig" ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes[ "$size-orig" ]['file'] != $meta['sizes'][ $size ]['file'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE )
+ && $backup_sizes[ "$size-orig" ]['file'] !== $meta['sizes'][ $size ]['file']
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = "$size-$suffix";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,10 +1103,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'thumbnail' === $target || 'all' === $target || 'full' === $target ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if it's an image edit from attachment edit screen.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' === $_REQUEST['context'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $return->thumbnail = $thumb_url[0];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $file_url = wp_get_attachment_url( $post_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta['sizes']['thumbnail'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb = $meta['sizes']['thumbnail'];
</span><span class="cx" style="display: block; padding: 0 10px"> $return->thumbnail = path_join( dirname( $file_url ), $thumb['file'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1109,5 +1126,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $return->msg = esc_js( __( 'Image saved' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>