X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..c81aba3d563f7459dc79140e4c5be67bcf506b92:/wp-admin/async-upload.php?ds=sidebyside
diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index add61649..371a65d3 100644
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -1,6 +1,6 @@
';
echo '' . _x( 'Edit', 'media item' ) . '';
- $title = $post->post_title ? $post->post_title : wp_basename( $post->guid ); // title shouldn't ever be empty, but use filename just in cas.e
+
+ // Title shouldn't ever be empty, but use filename just in case.
+ $file = get_attached_file( $post->ID );
+ $title = $post->post_title ? $post->post_title : wp_basename( $file );
echo '
' . esc_html( wp_html_excerpt( $title, 60, '…' ) ) . '
';
break;
case 2 :
@@ -88,7 +92,7 @@ $id = media_handle_upload( 'async-upload', $post_id );
if ( is_wp_error($id) ) {
echo '
' . __('Dismiss') . '
-
' . sprintf(__('“%s” has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '' .
+
' . sprintf(__('“%s” has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '' .
esc_html($id->get_error_message()) . '
';
exit;
}
@@ -103,7 +107,7 @@ if ( $_REQUEST['short'] ) {
/**
* Filter the returned ID of an uploaded attachment.
*
- * The dynamic portion of the hook name, $type, refers to the attachment type,
+ * The dynamic portion of the hook name, `$type`, refers to the attachment type,
* such as 'image', 'audio', 'video', 'file', etc.
*
* @since 2.5.0