WordPress 4.2.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 add616495411022343503d99d8ebcfd0efab68b8..4a18aa144905f55739067b5ca9de0ce81fd290dc 100644 (file)
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -1,6 +1,6 @@
 <?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
@@ -32,10 +32,7 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio
 
 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'] ) {
        include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
@@ -47,6 +44,10 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
        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 );
@@ -103,7 +104,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