From cd99ca7b90832c79cf056918638841e00b47bcc1 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 2 Jan 2007 19:28:30 +0000 Subject: [PATCH] Attachment fixes from mdawaffe. fixes #3411 git-svn-id: http://svn.automattic.com/wordpress/trunk@4670 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-functions.php | 6 +-- wp-admin/upload-functions.php | 35 ++++++------- wp-admin/upload-js.php | 31 +++++++---- wp-includes/post-template.php | 66 ++++++++++-------------- wp-includes/post.php | 96 ++++++++++++++++++++++++++++++++++- wp-includes/script-loader.php | 2 +- 6 files changed, 166 insertions(+), 70 deletions(-) diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index e6d1afabee..e6930f8dd3 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1935,12 +1935,12 @@ function the_attachment_links( $id = false ) { - + - + @@ -1949,7 +1949,7 @@ function the_attachment_links( $id = false ) { - + diff --git a/wp-admin/upload-functions.php b/wp-admin/upload-functions.php index 5e6c8c8293..ef54c504f2 100644 --- a/wp-admin/upload-functions.php +++ b/wp-admin/upload-functions.php @@ -13,16 +13,13 @@ function wp_upload_display( $dims = false, $href = '' ) { $class = 'text'; $innerHTML = get_attachment_innerHTML( $id, false, $dims ); - if ( $image_src = strstr($innerHTML, 'src=') ) { - preg_match("/src=(\"|')(.+?)\\1/", $image_src, $matches); - $image_src = $matches[2]; + if ( $image_src = get_attachment_icon_src() ) { $image_rel = wp_make_link_relative($image_src); - $class = 'image'; $innerHTML = ' ' . str_replace($image_src, $image_rel, $innerHTML); - $image_base = str_replace($image_rel, '', $image_src); + $class = 'image'; } - $src_base = get_the_guid(); + $src_base = wp_get_attachment_url(); $src = wp_make_link_relative( $src_base ); $src_base = str_replace($src, '', $src_base); @@ -38,11 +35,16 @@ function wp_upload_display( $dims = false, $href = '' ) { $r .= "\t\t\t\t\n"; $r .= "\t\t\t\t\n"; - if ( isset($attachment_data['thumb']) ) { - $r .= "\t\t\t\t\n"; - $r .= "\t\t\t\t\n"; - } elseif ( $image_rel ) - $r .= "\t\t\t\t\n"; + if ( !$thumb_base = wp_get_attachment_thumb_url() ) + $thumb_base = wp_mime_type_icon(); + if ( $thumb_base ) { + $thumb_rel = wp_make_link_relative( $thumb_base ); + $thumb_base = str_replace( $thumb_rel, '', $thumb_base ); + $r .= "\t\t\t\t\n"; + $r .= "\t\t\t\t\n"; + } + $is_image = (int) wp_attachment_is_image(); + $r .= "\t\t\t\t\n"; if ( isset($width) ) { $r .= "\t\t\t\t\n"; $r .= "\t\t\t\t\n"; @@ -62,7 +64,7 @@ function wp_upload_view() {

"; + echo ""; the_title(); if ( !isset($attachment_data['width']) && 'inline' != $style ) echo ''; @@ -79,7 +81,7 @@ function wp_upload_view() {
"; + echo ""; echo wp_upload_display( array(171, 128) ); if ( isset($attachment_data['width']) && 'inline' != $style ) echo ''; ?> @@ -102,7 +104,7 @@ function wp_upload_form() { ?>

"; + echo ""; the_title(); if ( !isset($attachment_data['width']) && 'inline' != $style ) echo ''; @@ -119,7 +121,7 @@ function wp_upload_form() {
"; + echo ""; echo wp_upload_display( array(171, 128) ); if ( isset($attachment_data['width']) && 'inline' != $style ) echo ''; ?> @@ -129,7 +131,7 @@ function wp_upload_form() { - + @@ -343,4 +345,3 @@ function wp_upload_admin_head() { echo ""; } } - diff --git a/wp-admin/upload-js.php b/wp-admin/upload-js.php index e5a65f2e5e..67d7a9ea11 100644 --- a/wp-admin/upload-js.php +++ b/wp-admin/upload-js.php @@ -37,15 +37,11 @@ addLoadEvent( function() { if ( id == this.currentImage.ID ) return; var thumbEl = $('attachment-thumb-url-' + id); - this.currentImage.isImage = true; if ( thumbEl ) { this.currentImage.thumb = ( 0 == id ? '' : thumbEl.value ); this.currentImage.thumbBase = ( 0 == id ? '' : $('attachment-thumb-url-base-' + id).value ); } else { this.currentImage.thumb = false; - var isImageEl = $('attachment-is-image-' + id); - if ( !isImageEl ) - this.currentImage.isImage = false; } this.currentImage.src = ( 0 == id ? '' : $('attachment-url-' + id).value ); this.currentImage.srcBase = ( 0 == id ? '' : $('attachment-url-base-' + id).value ); @@ -60,6 +56,7 @@ addLoadEvent( function() { this.currentImage.width = false; this.currentImage.height = false; } + this.currentImage.isImage = ( 0 == id ? '' : $('attachment-is-image-' + id).value ); this.currentImage.ID = id; }, @@ -96,10 +93,22 @@ addLoadEvent( function() { h += "
"; h += ""; - if ( this.currentImage.thumb ) { + var display = []; + var checked = 'display-title'; + if ( 1 == this.currentImage.isImage ) { + checked = 'display-full'; + if ( this.currentImage.thumb ) { + display.push("
"); + checked = 'display-thumb'; + } + display.push(""); + } else if ( this.currentImage.thumb ) { + display.push(""); + } + if ( display.length ) { + display.push("
"); h += ""; } @@ -117,6 +126,10 @@ addLoadEvent( function() { h += ""; new Insertion.Top('upload-content', h); + var displayEl = $(checked); + if ( displayEl ) + displayEl.checked = true; + if (e) Event.stop(e); return false; }, @@ -144,7 +157,7 @@ addLoadEvent( function() { else h += "

" + this.currentImage.title + "

"; h += " — "; - h += "" + h += "" h += ""; h += '' h += "
"; @@ -222,7 +235,7 @@ addLoadEvent( function() { if ( 'none' != link ) h += ""; - if ( display ) + if ( display && 'title' != display ) h += "" + this.currentImage.title + ""; else h += this.currentImage.title; diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 101c9b6f8e..31b349d414 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -331,71 +331,59 @@ function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false) $id = (int) $id; $_post = & get_post($id); - if ( ('attachment' != $_post->post_type) || ('' == $_post->guid) ) + if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url() ) return __('Missing Attachment'); $post_title = attribute_escape($_post->post_title); - if (! empty($_post->guid) ) { - $innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims); - - return "$innerHTML"; - - } else { - $p .= __('Missing Attachment'); - } - return $p; + $innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims); + return "$innerHTML"; } -function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) { +function get_attachment_icon_src( $id = 0, $fullsize = false ) { $id = (int) $id; - $post = & get_post($id); - - $mime = $post->post_mime_type; + if ( !$post = & get_post($id) ) + return false; $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)) - && file_exists($thumbfile) ) { + if ( !$fullsize && $thumbfile = wp_get_attachment_thumb_file( $post->ID ) ) { // We have a thumbnail desired, specified and existing - $src = str_replace(basename($post->guid), $imagedata['thumb'], $post->guid); + $src = wp_get_attachment_thumb_url( $post->ID ); $src_file = $thumbfile; $class = 'attachmentthumb'; - - } elseif ( ( substr($mime, 0, 6) == 'image/' || 'import' == $mime && in_array(substr($file, -3), $exts) ) - && file_exists($file) ) { - + } elseif ( wp_attachment_is_image( $post->ID ) ) { // We have an image without a thumbnail - $src = $post->guid; + $src = wp_get_attachment_url( $post->ID ); $src_file = & $file; $class = 'attachmentimage'; - } elseif (! empty($mime) ) { - + } elseif ( $src = wp_mime_type_icon( $post->ID ) ) { // No thumb, no image. We'll look for a mime-related icon instead. - $icon_dir = apply_filters('icon_dir', get_template_directory().'/images'); - $icon_dir_uri = apply_filters('icon_dir_uri', get_template_directory_uri().'/images'); - $types = array(substr($mime, 0, strpos($mime, '/')), substr($mime, strpos($mime, '/') + 1), str_replace('/', '_', $mime)); - foreach ($types as $type) { - foreach ($exts as $ext) { - $src_file = "$icon_dir/$type.$ext"; - if ( file_exists($src_file) ) { - $src = "$icon_dir_uri/$type.$ext"; - break 2; - } - } - } + $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' ); + $src_file = $icon_dir . '/' . basename($src); } - if (! isset($src) ) + if ( !isset($src) ) return false; + return array($src, $src_file); +} + +function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) { + $id = (int) $id; + if ( !$post = & get_post($id) ) + return false; + + if ( !$src = get_attachment_icon_src( $id, $fullsize ) ) + return false; + + list($src, $src_file) = $src; // Do we need to constrain the image? if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) { @@ -424,7 +412,7 @@ function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) { $icon = "$post_title"; - return apply_filters('attachment_icon', $icon, $post->ID); + return apply_filters( 'attachment_icon', $icon, $post->ID ); } function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) { diff --git a/wp-includes/post.php b/wp-includes/post.php index 9d4c35fe6a..25c1fb367a 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1410,6 +1410,7 @@ function wp_get_attachment_metadata( $post_id, $unfiltered = false ) { } function wp_update_attachment_metadata( $post_id, $data ) { + $post_id = (int) $post_id; if ( !get_post( $post_id ) ) return false; @@ -1423,6 +1424,99 @@ function wp_update_attachment_metadata( $post_id, $data ) { return add_post_meta( $post_id, '_wp_attachment_metadata', $data ); } +function wp_get_attachment_url( $post_id = 0 ) { + $post_id = (int) $post_id; + if ( !$post =& get_post( $post_id ) ) + return false; + + $url = get_the_guid( $post_id ); + + if ( 'attachment' != $post->post_type || !$url ) + return false; + + return apply_filters( 'wp_get_attachment_url', $url, $post_id ); +} + +function wp_get_attachment_thumb_file( $post_id ) { + $post_id = (int) $post_id; + if ( !$imagedata = wp_get_attachment_metadata( $post_id ) ) + return false; + + $file = get_attached_file( $post_id ); + + if ( !empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile) ) + return apply_filters( 'wp_get_attachment_thumb_file', $thumbfile, $post_id ); + return false; +} + +function wp_get_attachment_thumb_url( $post_id = 0 ) { + $post_id = (int) $post_id; + if ( !$url = wp_get_attachment_url( $post_id ) ) + return false; + + if ( !$thumb = wp_get_attachment_thumb_file( $post_id ) ) + return false; + return false; + + $url = str_replace(basename($url), basename($thumb), $url); + + return apply_filters( 'wp_get_attachment_thumb_url', $url, $post_id ); +} + +function wp_attachment_is_image( $post_id = 0 ) { + $post_id = (int) $post_id; + if ( !$post =& get_post( $post_id ) ) + return false; + + if ( !$file = get_attached_file( $post->ID ) ) + return false; + + $image_exts = array('/jpg', 'jpeg', '/gif', '/png'); + + if ( 'image/' == substr($post->post_mime_type, 0, 6) || 'import' == $post->post_mime_type && in_array(substr($file, -4), $exts) ) + return true; + return false; +} + +function wp_mime_type_icon( $mime = 0 ) { + $post_id = 0; + if ( is_numeric($mime) ) { + $mime = (int) $mime; + if ( !$post =& get_post( $mime ) ) + return false; + $post_id = $post->ID; + $mime = $post->post_mime_type; + } + + if ( empty($mime) ) + return false; + + $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' ); + $icon_dir_uri = apply_filters( 'icon_dir_uri', get_template_directory_uri() . '/images' ); + + $types = array( + substr($mime, 0, strpos($mime, '/')), + substr($mime, strpos($mime, '/') + 1), + str_replace('/', '_', $mime) + ); + + $exts = array('jpg', 'gif', 'png'); + + $src = false; + + foreach ( $types as $type ) { + foreach ( $exts as $ext ) { + $src_file = "$icon_dir/$type.$ext"; + if ( file_exists($src_file) ) { + $src = "$icon_dir_uri/$type.$ext"; + break 2; + } + } + } + + return apply_filters( 'wp_mime_type_icon', $src, $mime, $post_id ); // Last arg is 0 if function pass mime type. +} + function wp_check_for_changed_slugs($post_id) { if ( !strlen($_POST['wp-old-slug']) ) return $post_id; @@ -1450,4 +1544,4 @@ function wp_check_for_changed_slugs($post_id) { return $post_id; } -?> \ No newline at end of file +?> diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 26b8fc7b59..5580dee14b 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -35,7 +35,7 @@ class WP_Scripts { $this->add( 'admin-comments', '/wp-admin/edit-comments.js', array('listman'), '3847' ); $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '4583' ); $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' ); - $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '4535' ); + $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '20061223' ); } }
"; - h += "
"; - h += ""; + $A(display).each( function(i) { h += i; } ); h += "