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 a16c8d3aa8ca6f4583349ef05ee342d021eaddcf..371a65d305591cb3c8ef3fe0d24ad306ab761533 100644 (file)
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -1,12 +1,18 @@
 <?php
 /**
 <?php
 /**

- * Accepts file uploads from swfupload or other asynchronous upload methods.
+ * Server-side file upload handler from wp-plupload, swfupload or other asynchronous upload methods.

  *
  * @package WordPress
  * @subpackage Administration
  */
 
  *
  * @package WordPress
  * @subpackage Administration
  */
 

-define('WP_ADMIN', true);
+if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
+       define( 'DOING_AJAX', true );
+}
+
+if ( ! defined( 'WP_ADMIN' ) ) {
+       define( 'WP_ADMIN', true );
+}

 
 if ( defined('ABSPATH') )
        require_once(ABSPATH . 'wp-load.php');
 
 if ( defined('ABSPATH') )
        require_once(ABSPATH . 'wp-load.php');


@@ -26,14 +32,10 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio
 
 require_once( ABSPATH . 'wp-admin/admin.php' );
 
 
 require_once( ABSPATH . 'wp-admin/admin.php' );
 

-if ( !current_user_can('upload_files') )
-       wp_die(__('You do not have permission to upload files.'));
-
-header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );

 
 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
 
 if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {

-       define( 'DOING_AJAX', true );
-       include ABSPATH . 'wp-admin/includes/ajax-actions.php';
+       include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );

 
        send_nosniff_header();
        nocache_headers();
 
        send_nosniff_header();
        nocache_headers();


@@ -42,6 +44,10 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
        die( '0' );
 }
 
        die( '0' );
 }
 

+if ( ! current_user_can( 'upload_files' ) ) {
+       wp_die( __( 'You do not have permission to upload files.' ) );
+}
+

 // 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 );


@@ -55,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 :


@@ -81,25 +90,25 @@ if ( isset( $_REQUEST['post_id'] ) ) {
 
 $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {
 
 $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {

-       echo '<div class="error-div">
+       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>
        <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;
 }
 
 if ( $_REQUEST['short'] ) {
        esc_html($id->get_error_message()) . '</div>';
        exit;
 }
 
 if ( $_REQUEST['short'] ) {

-       // short form response - attachment ID only
+       // Short form response - attachment ID only.

        echo $id;
 } else {
        echo $id;
 } else {

-       // long form response - big chunk o html
+       // Long form response - big chunk o html.

        $type = $_REQUEST['type'];
 
        /**
         * Filter the returned ID of an uploaded attachment.
         *
        $type = $_REQUEST['type'];
 
        /**
         * Filter the returned ID of an uploaded attachment.
         *

-        * The dynamic portion of the hook name, $type, refers to the attachment type,
-        * such as 'iamge', 'audio', 'video', 'file', etc.
+        * The dynamic portion of the hook name, `$type`, refers to the attachment type,
+        * such as 'image', 'audio', 'video', 'file', etc.

         *
         * @since 2.5.0
         *
         *
         * @since 2.5.0
         *