Wordpress 2.7.1

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

diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index 1a37dceb96bf725f18e8de357dd4dd8292e7cbaf..8ee85fc1f838924581e9fe78efcba146389d5145 100644 (file)
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -1,31 +1,42 @@
 <?php
-
-/* This accepts file uploads from swfupload or other asynchronous upload methods.
-
-*/
+/**
+ * Accepts file uploads from swfupload or other asynchronous upload methods.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
 
 if ( defined('ABSPATH') )
-       require_once( ABSPATH . 'wp-config.php');
+       require_once(ABSPATH . 'wp-load.php');
 else
-    require_once('../wp-config.php');
+       require_once('../wp-load.php');
 
 // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-if ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+       $_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
        $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
 unset($current_user);
 require_once('admin.php');
 
-header('Content-Type: text/plain');
+header('Content-Type: text/plain; charset=' . get_option('blog_charset'));
 
 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 ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
-       echo get_media_item($id);
+// just fetch the detail form for that attachment
+if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+       if ( 2 == $_REQUEST['fetch'] ) {
+               add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
+               echo get_media_item($id, array( 'send' => false, 'delete' => false ));
+       } else {
+               echo get_media_item($id);
+       }
        exit;
 }
 
+check_admin_referer('media-form');
+
 $id = media_handle_upload('async-upload', $_REQUEST['post_id']);
 if (is_wp_error($id)) {
        echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>';
@@ -42,4 +53,4 @@ else {
        echo apply_filters("async_upload_{$type}", $id);
 }
 
-?>
+?>
\ No newline at end of file