Index: wp-admin/admin-functions.php =================================================================== --- wp-admin/admin-functions.php (revision 3773) +++ wp-admin/admin-functions.php (working copy) @@ -1905,6 +1905,56 @@ return array((int) ($width / $height * $hmax), $hmax); } +function wp_attach_upload($file_array, $post) { + + $url = $file_array['url']; + $type = $file_array['type']; + $imgtitle = $file_array['title']; + $descr = $file_array['description']; + $file = addslashes($file_array['file']); + $filename = basename($file); + + // Construct the attachment array + $attachment = array( + 'post_title' => $imgtitle ? $imgtitle : $filename, + 'post_content' => $descr, + 'post_type' => 'attachment', + 'post_parent' => $post, + 'post_mime_type' => $type, + 'guid' => $url + ); + + //remove ABSPATH from db storage + $relfile = str_replace(addslashes(ABSPATH), '', $file); + + // Save the data (also inserts _wp_attached_file meta data as $relfile) + $id = wp_insert_attachment($attachment, $relfile, $post); + + if ( preg_match('!^image/!', $type) ) { + + $imagesize = getimagesize($file); + $attachdata['width'] = $imagesize['0']; + $attachdata['height'] = $imagesize['1']; + + if ( $attachdata['width'] * $attachdata['height'] < 3 * 1024 * 1024 ) { + if ( $attachdata['width'] > 128 && $attachdata['width'] >= $attachdata['height'] * 4 / 3 ) + $thumb = wp_create_thumbnail($file, 128); + elseif ( $attachdata['height'] > 96 ) + $thumb = wp_create_thumbnail($file, 96); + + if ( @file_exists($thumb) ) { + $attachdata['thumb'] = basename($thumb); + } + } + + add_post_meta($id, '_wp_attachment_metadata', $attachdata); + } + + do_action('wp_attach_upload', $id); + + return $id; +} + function wp_import_cleanup($id) { wp_delete_attachment($id); } @@ -1959,8 +2009,7 @@ } function the_attachment_links($id = false) { - $id = (int) $id; - $post = & get_post($id); + $post = get_attachment($id); if ( $post->post_type != 'attachment' ) return false; @@ -1981,13 +2030,9 @@ 4 / 3 ) - return array(128, (int) ($height / $width * 128)); - else - return array((int) ($width / $height * 96), 96); + return wp_shrink_dimensions($width, $height); } ?> Index: wp-admin/inline-uploading.php =================================================================== --- wp-admin/inline-uploading.php (revision 3773) +++ wp-admin/inline-uploading.php (working copy) @@ -50,58 +50,16 @@ $overrides = array('action'=>'save'); -$file = wp_handle_upload($_FILES['image'], $overrides); +$file_array = wp_handle_upload($_FILES['image'], $overrides); -if ( isset($file['error']) ) - die($file['error'] . '
'.__('Back to Image Uploading').''); +if ( isset($file_array['error']) ) + die($file_array['error'] . '
'.__('Back to Image Uploading').''); -$url = $file['url']; -$type = $file['type']; -$file = $file['file']; -$filename = basename($file); +$file_array['title'] = $imgtitle; +$file_array['description'] = $descr; -// Construct the attachment array -$attachment = array( - 'post_title' => $imgtitle ? $imgtitle : $filename, - 'post_content' => $descr, - 'post_type' => 'attachment', - 'post_parent' => $post, - 'post_mime_type' => $type, - 'guid' => $url - ); +$id = wp_attach_upload($file_array, $post); -// Save the data -$id = wp_insert_attachment($attachment, $file, $post); - -if ( preg_match('!^image/!', $attachment['post_mime_type']) ) { - // Generate the attachment's postmeta. - $imagesize = getimagesize($file); - $imagedata['width'] = $imagesize['0']; - $imagedata['height'] = $imagesize['1']; - list($uwidth, $uheight) = get_udims($imagedata['width'], $imagedata['height']); - $imagedata['hwstring_small'] = "height='$uheight' width='$uwidth'"; - $imagedata['file'] = $file; - - add_post_meta($id, '_wp_attachment_metadata', $imagedata); - - if ( $imagedata['width'] * $imagedata['height'] < 3 * 1024 * 1024 ) { - if ( $imagedata['width'] > 128 && $imagedata['width'] >= $imagedata['height'] * 4 / 3 ) - $thumb = wp_create_thumbnail($file, 128); - elseif ( $imagedata['height'] > 96 ) - $thumb = wp_create_thumbnail($file, 96); - - if ( @file_exists($thumb) ) { - $newdata = $imagedata; - $newdata['thumb'] = basename($thumb); - update_post_meta($id, '_wp_attachment_metadata', $newdata, $imagedata); - } else { - $error = $thumb; - } - } -} else { - add_post_meta($id, '_wp_attachment_metadata', array()); -} - header("Location: " . basename(__FILE__) . "?post=$post&all=$all&action=view&start=0"); die(); @@ -138,7 +96,7 @@ if ( '' == $sort ) $sort = "post_date_gmt DESC"; -$attachments = $wpdb->get_results("SELECT ID, post_date, post_title, post_mime_type, guid FROM $wpdb->posts WHERE post_type = 'attachment' $and_type $and_post $and_user ORDER BY $sort LIMIT $start, $double", ARRAY_A); +$attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_type = 'attachment' $and_type $and_post $and_user ORDER BY $sort LIMIT $start, $double", ARRAY_A); if ( count($attachments) == 0 ) { header("Location: " . basename(__FILE__) ."?post=$post&action=upload" ); @@ -200,16 +158,12 @@ "; foreach ( $attachments as $key => $attachment ) { $ID = $attachment['ID']; - $href = get_attachment_link($ID); - $meta = get_post_meta($ID, '_wp_attachment_metadata', true); - if (!is_array($meta)) { - $meta = get_post_meta($ID, 'imagedata', true); // Try 1.6 Alpha meta key - if (!is_array($meta)) { - $meta = array(); - } - add_post_meta($ID, '_wp_attachment_metadata', $meta); - } - $attachment = array_merge($attachment, $meta); + $att_post = get_attachment($ID); + $title = $att_post->post_title; + $description = $att_post->post_content; + $mime = $att_post->post_mime_type; + $guid = $att_post->guid; + $attachment = $att_post->attachment_metadata; $noscript = " @@ -219,30 +173,30 @@ $__close "; $uwidth_sum += 128; - if ( preg_match('!^image/!', $attachment['post_mime_type'] ) ) { + if ( preg_match('!^image/!', $mime ) ) { $image = & $attachment; if ( ($image['width'] > 128 || $image['height'] > 96) && !empty($image['thumb']) && file_exists(dirname($image['file']).'/'.$image['thumb']) ) { - $src = str_replace(basename($image['guid']), $image['thumb'], $image['guid']); + $src = str_replace(basename($guid), $image['thumb'], $guid); $script .= "srca[{$ID}] = '$src'; -srcb[{$ID}] = '{$image['guid']}'; +srcb[{$ID}] = '{$guid}'; "; $thumb = 'true'; $thumbtext = $__using_thumbnail; } else { - $src = $image['guid']; + $src = $guid; $thumb = 'false'; $thumbtext = $__no_thumbnail; } - list($image['uwidth'], $image['uheight']) = get_udims($image['width'], $image['height']); + list($image['uwidth'], $image['uheight']) = wp_shrink_dimensions($image['width'], $image['height']); $height_width = 'height="'.$image['uheight'].'" width="'.$image['uwidth'].'"'; $xpadding = (128 - $image['uwidth']) / 2; $ypadding = (96 - $image['uheight']) / 2; $style .= "#target{$ID} img { padding: {$ypadding}px {$xpadding}px; }\n"; - $title = wp_specialchars($image['post_title'], ENT_QUOTES); - $script .= "aa[{$ID}] = ''; -ab[{$ID}] = ''; + $title = wp_specialchars($title, ENT_QUOTES); + $script .= "aa[{$ID}] = ''; +ab[{$ID}] = ''; imga[{$ID}] = '\"{$title}\"'; -imgb[{$ID}] = '\"{$title}\"'; +imgb[{$ID}] = '\"{$title}\"'; "; $html .= "
@@ -258,25 +212,25 @@
"; } else { - $title = wp_specialchars($attachment['post_title'], ENT_QUOTES); - $filename = basename($attachment['guid']); + $title = wp_specialchars($title, ENT_QUOTES); + $filename = basename($guid); $icon = get_attachment_icon($ID); $toggle_icon = "$__using_title"; - $script .= "aa[{$ID}] = ''; -ab[{$ID}] = ''; + $script .= "aa[{$ID}] = ''; +ab[{$ID}] = ''; title[{$ID}] = '{$title}'; filename[{$ID}] = '{$filename}'; icon[{$ID}] = '{$icon}'; "; $html .= "
{$noscript}
"; $popups .= "