Changeset 4682

Timestamp:

01/05/2007 08:54:55 PM (19 years ago)

Author:

ryan

Message:

wp_get_attachment_thumb_url() fix from mdawaffe. fixes #3520

Location:

trunk/wp-includes

Files:

• post-template.php (modified) (2 diffs)
• post.php (modified) (3 diffs)

trunk/wp-includes/post-template.php

@@ -379 +379 @@
         return false;
 
-    if ( !$src = get_attachment_icon_src( $id, $fullsize ) )
+    if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
         return false;
 
@@ -416 +416 @@
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
     $id = (int) $id;
-
-    if ( $innerHTML = get_attachment_icon($id, $fullsize, $max_dims))
+    if ( !$post = & get_post($id) )
+        return false;
+
+    if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
         return $innerHTML;
 
-    $post = & get_post($id);
 
     $innerHTML = attribute_escape($post->post_title);

trunk/wp-includes/post.php

@@ -1403 +1403 @@
 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 ( !$post =& get_post( $post_id ) )
+        return false;
+
+    $data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
     if ( $unfiltered )
         return $data;
-    return apply_filters( 'wp_get_attachment_metadata', $data, $post_id );
+    return apply_filters( 'wp_get_attachment_metadata', $data, $post->ID );
 }
 
 function wp_update_attachment_metadata( $post_id, $data ) {
     $post_id = (int) $post_id;
-    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 ( !$post =& 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 );
+        return update_post_meta( $post->ID, '_wp_attachment_metadata', $data, $old_data );
     else
-        return add_post_meta( $post_id, '_wp_attachment_metadata', $data );
+        return add_post_meta( $post->ID, '_wp_attachment_metadata', $data );
 }
 
@@ -1430 +1432 @@
         return false;
 
-    $url = get_the_guid( $post_id );
+    $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 ) {
+    return apply_filters( 'wp_get_attachment_url', $url, $post->ID );
+}
+
+function wp_get_attachment_thumb_file( $post_id = 0 ) {
     $post_id = (int) $post_id;
-    if ( !$imagedata = wp_get_attachment_metadata( $post_id ) )
-        return false;
-
-    $file = get_attached_file( $post_id );
+    if ( !$post =& get_post( $post_id ) )
+        return false;
+    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 apply_filters( 'wp_get_attachment_thumb_file', $thumbfile, $post->ID );
     return false;
 }
@@ -1452 +1456 @@
 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 ) )
+    if ( !$post =& get_post( $post_id ) )
+        return false;
+    if ( !$url = wp_get_attachment_url( $post->ID ) )
+        return false;
+
+    if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) )
         return false;
 
     $url = str_replace(basename($url), basename($thumb), $url);
 
-    return apply_filters( 'wp_get_attachment_thumb_url', $url, $post_id );
+    return apply_filters( 'wp_get_attachment_thumb_url', $url, $post->ID );
 }