Changeset 21967

Timestamp:

09/24/2012 01:07:34 PM (12 years ago)

Author:

ryan

Message:

Don't add empty _wp_attached_file, _wp_attachment_metadata, _thumbnail_id meta to posts. Delete these fields when set to empty. Props SergeyBiryukov, Caspie. fixes #16391

File:

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

trunk/wp-includes/post.php

@@ -208 +208 @@
 
     $file = apply_filters( 'update_attached_file', $file, $attachment_id );
-    $file = _wp_relative_upload_path($file);
-
-    return update_post_meta( $attachment_id, '_wp_attached_file', $file );
+    if ( $file = _wp_relative_upload_path( $file ) )
+        return update_post_meta( $attachment_id, '_wp_attached_file', $file );
+    else
+        return delete_post_meta( $attachment_id, '_wp_attached_file' );
 }
 
@@ -4029 +4030 @@
         return false;
 
-    $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID );
-
-    return update_post_meta( $post->ID, '_wp_attachment_metadata', $data);
+    if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) )
+        return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
+    else
+        return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
 }
 
@@ -5209 +5211 @@
     $thumbnail_id = absint( $thumbnail_id );
     if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
-        $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' );
-        if ( ! empty( $thumbnail_html ) ) {
+        if ( $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) )
             return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
-        }
+        else
+            return delete_post_meta( $post->ID, '_thumbnail_id' );
     }
     return false;