Changeset 11965 for trunk/wp-includes/post.php

Timestamp:

09/24/2009 01:54:07 AM (16 years ago)

Author:

azaozz

Message:

Image Editor improvements, see #10528

File:

• trunk/wp-includes/post.php (modified) (4 diffs)

trunk/wp-includes/post.php

@@ -2576 +2576 @@
     delete_post_meta($post_id, '_wp_trash_meta_time');
 
-    $meta = wp_get_attachment_metadata( $post_id, false, false );
+    $meta = wp_get_attachment_metadata( $post_id );
+    $backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
     $file = get_attached_file( $post_id );
 
@@ -2610 +2611 @@
     }
 
-    if ( isset($meta['sizes']) && is_array($meta['sizes']) ) {
-        foreach ( array_keys($meta['sizes']) as $size ) {
-            if ( preg_match('/backup-[0-9]+/', $size) ) { // make sure this is a backup
-                if ( $del = image_get_intermediate_size($post_id, $size) ) {
-                    $del_file = apply_filters('wp_delete_file', $del['path']);
-                    @ unlink( path_join($uploadpath['basedir'], $del_file) );
-                }
-            }
+    if ( is_array($backup_sizes) ) {
+        foreach ( $backup_sizes as $size ) {
+            $del_file = path_join( dirname($meta['file']), $size['file'] );
+            $del_file = apply_filters('wp_delete_file', $del_file);
+            @ unlink( path_join($uploadpath['basedir'], $del_file) );
         }
     }
@@ -2640 +2638 @@
  * @return string|bool Attachment meta field. False on failure.
  */
-function wp_get_attachment_metadata( $post_id, $unfiltered = false, $remove_backups = true ) {
+function wp_get_attachment_metadata( $post_id, $unfiltered = false ) {
     $post_id = (int) $post_id;
     if ( !$post =& get_post( $post_id ) )
@@ -2646 +2644 @@
 
     $data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
-
-    if ( $remove_backups && isset($data['sizes']) && is_array($data['sizes']) ) {
-        $sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') );
-        foreach ( $data['sizes'] as $size => $val ) {
-            if ( !in_array( $size, $sizes, true ) )
-                unset($data['sizes'][$size]);
-        }
-    }
 
     if ( $unfiltered )