Changeset 3303 for trunk/wp-includes/functions-post.php

Timestamp:

12/13/2005 07:19:56 PM (20 years ago)

Author:

ryan

Message:

Attachment enhancements from skeltoac. fixes #2074

File:

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

trunk/wp-includes/functions-post.php

@@ -209 +209 @@
 }
 
-function wp_insert_attachment($object, $file, $post_parent = 0) {
+function wp_insert_attachment($object, $file = false, $post_parent = 0) {
     global $wpdb, $user_ID;
 
     if ( is_object($object) )
         $object = get_object_vars($object);
-    
+
     // Export array as variables
     extract($object);
@@ -321 +321 @@
     wp_set_post_cats('', $post_ID, $post_category);
 
-    add_post_meta($post_ID, '_wp_attached_file', $file);
+    if ( $file )
+        add_post_meta($post_ID, '_wp_attached_file', $file);
 
     clean_post_cache($post_ID);
@@ -344 +345 @@
         return false;
 
-    $meta = get_post_meta($postid, 'imagedata', true);
+    $meta = get_post_meta($postid, '_wp_attachment_metadata', true);
     $file = get_post_meta($postid, '_wp_attached_file', true);
 
@@ -355 +356 @@
     $wpdb->query("DELETE FROM $wpdb->postmeta WHERE post_id = $postid");
 
-    if ( ! empty($meta['file']) )
-        @ unlink($meta['file']);
+    if ( ! empty($meta['thumb']) ) {
+        // Don't delete the thumb if another attachment uses it
+        if (! $foo = $wpdb->get_row("SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE '%".$wpdb->escape($meta['thumb'])."%' AND post_id <> $postid"))
+            @ unlink(str_replace(basename($file), $meta['thumb'], $file));
+    }
 
     if ( ! empty($file) )
@@ -429 +433 @@
         $postarr['post_date_gmt'] = '';
     }
+
+    if ($postarr['post_status'] == 'attachment')
+        return wp_insert_attachment($postarr);
 
     return wp_insert_post($postarr);
@@ -511 +518 @@
     if ( !$post = $wpdb->get_row("SELECT * FROM $wpdb->posts WHERE ID = $postid") )
         return $post;
+
+    if ( 'attachment' == $post->post_status )
+        return wp_delete_attachment($postid);
 
     do_action('delete_post', $postid);