";
@@ -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 = "
";
- 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' );
}
}