Changeset 31070 for trunk/src/wp-admin/includes/image-edit.php

Timestamp:

01/07/2015 10:47:32 PM (10 years ago)

Author:

azaozz

Message:

Image file editor: fix a wrong error message when restoring an edited image and IMAGE_EDIT_OVERWRITE is set. Props tiqbiz, fixes #30167.

File:

• trunk/src/wp-admin/includes/image-edit.php (modified) (2 diffs)

trunk/src/wp-admin/includes/image-edit.php

@@ -568 +568 @@
     $meta = wp_get_attachment_metadata($post_id);
     $file = get_attached_file($post_id);
-    $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+    $backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
     $restored = false;
     $msg = new stdClass;
@@ -630 +630 @@
     }
 
-    if ( !wp_update_attachment_metadata($post_id, $meta) || !update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes) ) {
+    if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
+        ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
+
         $msg->error = __('Cannot save image metadata.');
         return $msg;