WordPress 4.5.1-scripts

[autoinstalls/wordpress.git] / wp-admin / async-upload.php

diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index 08d710d27b5852ee36c32ae82febd5537eb4c417..371a65d305591cb3c8ef3fe0d24ad306ab761533 100644 (file)
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -32,6 +32,8 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio
 
 require_once( ABSPATH . 'wp-admin/admin.php' );
 
 
 require_once( ABSPATH . 'wp-admin/admin.php' );
 

+header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+

 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
        include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
 
 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
        include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
 


@@ -46,8 +48,6 @@ if ( ! current_user_can( 'upload_files' ) ) {
        wp_die( __( 'You do not have permission to upload files.' ) );
 }
 
        wp_die( __( 'You do not have permission to upload files.' ) );
 }
 

-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-

 // just fetch the detail form for that attachment
 if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
        $post = get_post( $id );
 // just fetch the detail form for that attachment
 if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
        $post = get_post( $id );


@@ -61,7 +61,10 @@ if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id
                        if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
                                echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
                        echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
                        if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
                                echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
                        echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';

-                       $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 '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
                        break;
                case 2 :
                        echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
                        break;
                case 2 :


@@ -89,7 +92,7 @@ $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {
        echo '<div class="error-div error">
        <a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
 if ( is_wp_error($id) ) {
        echo '<div class="error-div error">
        <a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>

-       <strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
+       <strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .

        esc_html($id->get_error_message()) . '</div>';
        exit;
 }
        esc_html($id->get_error_message()) . '</div>';
        exit;
 }