From 541e47c09b503df8bd9b6d149c82cb8d98ac2710 Mon Sep 17 00:00:00 2001 From: donncha Date: Mon, 30 Jun 2008 11:17:02 +0000 Subject: WP Merge to revision 8195 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1342 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/async-upload.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'wp-admin/async-upload.php') diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php index 59feb8c..18b8104 100644 --- a/wp-admin/async-upload.php +++ b/wp-admin/async-upload.php @@ -10,7 +10,9 @@ else 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'); -- cgit