Changeset 8242 for branches/crazyhorse/wp-admin/async-upload.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-admin/async-upload.php (modified) (1 diff)

branches/crazyhorse/wp-admin/async-upload.php

@@ -11 +11 @@
 
 // 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);