From 9537359dc4411982e8a7ef1bb4d2acc5d1826156 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 24 Feb 2008 04:34:40 +0000 Subject: [PATCH] disregard nonexistant attachments. Props andy. fixes #5967 git-svn-id: http://svn.automattic.com/wordpress/trunk@7002 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/media.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index f747fb5721..6d9d181d25 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -236,11 +236,9 @@ function get_multimedia_items( $post_id, $errors ) { if ( empty($attachments) ) return ''; - foreach ( $attachments as $id => $attachment ) { - $output .= "\n
"; - $output .= get_multimedia_item($id, isset($errors[$id]) ? $errors[$id] : null); - $output .= "
\n
"; - } + foreach ( $attachments as $id => $attachment ) + if ( $item = get_multimedia_item($id, isset($errors[$id]) ? $errors[$id] : null) ) + $output .= "\n
$item
\n
"; return $output; } @@ -418,7 +416,10 @@ function get_attachment_fields_to_edit($post, $errors = null) { } 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'); $description_label = __('Description');