Wordpress 2.6.2

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

diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index 1a37dceb96bf725f18e8de357dd4dd8292e7cbaf..18b810414168c571a4bc7e864b921885a89c6ac9 100644 (file)
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -5,17 +5,19 @@
 */
 
 if ( defined('ABSPATH') )
 */
 
 if ( defined('ABSPATH') )

-       require_once( ABSPATH . 'wp-config.php');
+       require_once(ABSPATH . 'wp-load.php');

 else
 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
 
 // 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');
 
        $_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.'));
 
 if ( !current_user_can('upload_files') )
        wp_die(__('You do not have permission to upload files.'));


@@ -26,6 +28,8 @@ if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
        exit;
 }
 
        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>';
 $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>';