Changeset 4612

Timestamp:

12/05/2006 10:37:19 PM (18 years ago)

Author:

ryan

Message:

Attachment data abstraction from mdawaffe. fixes #3440

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/upgrade-functions.php (modified) (1 diff)
• wp-admin/upload-functions.php (modified) (6 diffs)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (4 diffs)
• xmlrpc.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -2017 +2017 @@
 
     $icon = get_attachment_icon( $post->ID );
-    $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
+    $attachment_data = wp_get_attachment_metadata( $id );
     $thumb = isset( $attachment_data['thumb'] );
 ?>

trunk/wp-admin/page.php

@@ -72 +72 @@
 
     // Update the thumbnail filename
-    $oldmeta = $newmeta = get_post_meta($page_id, '_wp_attachment_metadata', true);
+    $newmeta = wp_get_attachment_metadata( $page_id, true );
     $newmeta['thumb'] = $_POST['thumb'];
 
-    if ( '' !== $oldmeta )
-        update_post_meta($page_id, '_wp_attachment_metadata', $newmeta, $oldmeta);
-    else
-        add_post_meta($page_id, '_wp_attachment_metadata', $newmeta);
+    wp_update_attachment_metadata( $newmeta );
 
 case 'editpost':

trunk/wp-admin/post.php

@@ -79 +79 @@
 
     // Update the thumbnail filename
-    $oldmeta = $newmeta = get_post_meta($post_id, '_wp_attachment_metadata', true);
+    $newmeta = wp_get_attachment_metadata( $post_id, true );
     $newmeta['thumb'] = $_POST['thumb'];
 
-    if ( '' !== $oldmeta )
-        update_post_meta($post_id, '_wp_attachment_metadata', $newmeta, $oldmeta);
-    else
-        add_post_meta($post_id, '_wp_attachment_metadata', $newmeta);
+    wp_update_attachment_metadata( $post_id, $newmeta );
 
 case 'editpost':

trunk/wp-admin/upgrade-functions.php

@@ -467 +467 @@
             $meta = get_post_meta($object->ID, 'imagedata', true);
             if ( ! empty($meta['file']) )
-                add_post_meta($object->ID, '_wp_attached_file', $meta['file']);
+                update_attached_file( $object->ID, $meta['file'] );
         }
     }

trunk/wp-admin/upload-functions.php

@@ -3 +3 @@
     global $post;
     $id = get_the_ID();
-    $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
+    $attachment_data = wp_get_attachment_metadata( $id );
     if ( isset($attachment_data['width']) )
         list($width,$height) = wp_shrink_dimensions($attachment_data['width'], $attachment_data['height'], 171, 128);
@@ -58 +58 @@
     global $style, $post_id, $style;
     $id = get_the_ID();
-    $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
+    $attachment_data = wp_get_attachment_metadata( $id );
 ?>
     <div id="upload-file">
@@ -99 +99 @@
     if ( $id ) :
         $attachment = get_post_to_edit( $id );
-        $attachment_data = get_post_meta( $id, '_wp_attachment_metadata', true );
+        $attachment_data = wp_get_attachment_metadata( $id );
 ?>
         <div id="file-title">
@@ -230 +230 @@
             $imagedata['file'] = $file;
 
-            add_post_meta($id, '_wp_attachment_metadata', $imagedata);
+            wp_update_attachment_metadata( $id, $imagedata );
 
             if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) {
@@ -241 +241 @@
                     $newdata = $imagedata;
                     $newdata['thumb'] = basename($thumb);
-                    update_post_meta($id, '_wp_attachment_metadata', $newdata, $imagedata);
+                    wp_update_attachment_metadata( $id, $newdata );
                 } else {
                     $error = $thumb;
@@ -247 +247 @@
             }
         } else {
-            add_post_meta($id, '_wp_attachment_metadata', array());
+            wp_update_attachment_metadata( $id, array() );
         }
 

trunk/wp-includes/post-template.php

@@ -354 +354 @@
     $mime = $post->post_mime_type;
 
-    $imagedata = get_post_meta($post->ID, '_wp_attachment_metadata', true);
-
-    $file = get_post_meta($post->ID, '_wp_attached_file', true);
+    $imagedata = wp_get_attachment_metadata( $post->ID );
+
+    $file = get_attached_file( $post->ID );
 
     $exts = array('jpg', 'gif', 'png');
-
     if ( !$fullsize && !empty($imagedata['thumb'])
             && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file))

trunk/wp-includes/post.php

@@ -5 +5 @@
 //
 
-function get_attached_file($attachment_id) {
-    return get_post_meta($attachment_id, '_wp_attached_file', true);
+function get_attached_file( $attachment_id, $unfiltered = false ) {
+    $file = get_post_meta( $attachment_id, '_wp_attached_file', true );
+    if ( $unfiltered )
+        return $file;
+    return apply_filters( 'get_attached_file', $file, $attachment_id );
+}
+
+function update_attached_file( $attachment_id, $file ) {
+    if ( !get_post( $attachment_id ) )
+        return false;
+
+    $old_file = get_attached_file( $attachment_id, true );
+
+    $file = apply_filters( 'update_attached_file', $file, $attachment_id );
+
+    if ( $old_file )
+        return update_post_meta( $attachment_id, '_wp_attached_file', $file, $old_file );
+    else
+        return add_post_meta( $attachment_id, '_wp_attached_file', $file );
 }
 
@@ -1332 +1349 @@
 
     if ( $file )
-        add_post_meta($post_ID, '_wp_attached_file', $file);
+        update_attached_file( $post_ID, $file );
 
     clean_post_cache($post_ID);
@@ -1355 +1372 @@
         return false;
 
-    $meta = get_post_meta($postid, '_wp_attachment_metadata', true);
-    $file = get_post_meta($postid, '_wp_attached_file', true);
+    $meta = wp_get_attachment_metadata( $postid );
+    $file = get_attached_file( $postid );
 
     $wpdb->query("DELETE FROM $wpdb->posts WHERE ID = '$postid'");
@@ -1385 +1402 @@
 }
 
+function wp_get_attachment_metadata( $post_id, $unfiltered = false ) {
+    $post_id = (int) $post_id;
+
+    $data = get_post_meta( $post_id, '_wp_attachment_metadata', true );
+    if ( $unfiltered )
+        return $data;
+    return apply_filters( 'wp_get_attachment_metadata', $data, $post_id );
+}
+
+function wp_update_attachment_metadata( $post_id, $data ) {
+    if ( !get_post( $post_id ) )
+        return false;
+
+    $old_data = wp_get_attachment_metadata( $post_id, true );
+
+    $data = apply_filters( 'wp_update_attachment_metadata', $data, $post_id );
+
+    if ( $old_data )
+        return update_post_meta( $post_id, '_wp_attachment_metadata', $data, $old_data );
+    else
+        return add_post_meta( $post_id, '_wp_attachment_metadata', $data );
+}
+
 ?>

trunk/xmlrpc.php

@@ -872 +872 @@
         );
         // Save the data
-        $id = wp_insert_attachment($attachment, $upload[ 'file' ], $post_id);
-        add_post_meta($id, '_wp_attachment_metadata', array());
+        $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
+        wp_update_attachment_metadata( $id, array() );
 
         return apply_filters( 'wp_handle_upload', array( 'file' => $upload[ 'file' ], 'url' => $upload[ 'url' ], 'type' => $type ) );