Changeset 7002 for trunk/wp-admin/includes/media.php

Timestamp:

02/24/2008 04:34:40 AM (18 years ago)

Author:

ryan

Message:

disregard nonexistant attachments. Props andy. fixes #5967

File:

• trunk/wp-admin/includes/media.php (modified) (2 diffs)

trunk/wp-admin/includes/media.php

@@ -237 +237 @@
         return '';
 
-    foreach ( $attachments as $id => $attachment ) {
-        $output .= "\n<div id='multimedia-item-$id' class='multimedia-item preloaded'><div id='media-upload-error-$id'></div><span class='filename'></span><div class='progress'><div class='bar'></div></div>";
-        $output .= get_multimedia_item($id, isset($errors[$id]) ? $errors[$id] : null);
-        $output .= "    <div class='progress clickmask'></div>\n</div>";
-    }
+    foreach ( $attachments as $id => $attachment )
+        if ( $item = get_multimedia_item($id, isset($errors[$id]) ? $errors[$id] : null) )
+            $output .= "\n<div id='multimedia-item-$id' class='multimedia-item preloaded'><div id='media-upload-error-$id'></div><span class='filename'></span><div class='progress'><div class='bar'></div></div>$item<div class='progress clickmask'></div>\n</div>";
 
     return $output;
@@ -419 +417 @@
 
 function get_multimedia_item( $attachment_id, $errors = null, $send = true ) {
-    $thumb_url = array_shift(get_attachment_icon_src( $attachment_id ));
+    if ( ( $attachment_id = intval($attachment_id) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
+        $thumb_url = $thumb_url[1];
+    else
+        return false;
 
     $title_label = __('Title');