diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-30 11:17:02 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-30 11:17:02 +0000 |
| commit | 541e47c09b503df8bd9b6d149c82cb8d98ac2710 (patch) | |
| tree | 94c90cfd4eee2b1035f886877b77f53d1f1717c8 /wp-admin/async-upload.php | |
| parent | 717b64911edf6baaa2aea29e13b8e808f088e660 (diff) | |
| download | wordpress-mu-541e47c09b503df8bd9b6d149c82cb8d98ac2710.tar.gz wordpress-mu-541e47c09b503df8bd9b6d149c82cb8d98ac2710.tar.xz wordpress-mu-541e47c09b503df8bd9b6d149c82cb8d98ac2710.zip | |
WP Merge to revision 8195
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1342 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/async-upload.php')
| -rw-r--r-- | wp-admin/async-upload.php | 4 |
1 files changed, 3 insertions, 1 deletions
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'); |