Changeset 8190
- Timestamp:
- 06/24/2008 10:19:27 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/async-upload.php
r8023 r8190 11 11 12 12 // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead 13 if ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) 13 if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) 14 $_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie']; 15 elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) 14 16 $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie']; 15 17 unset($current_user); -
trunk/wp-admin/includes/media.php
r8189 r8190 851 851 post_params : { 852 852 "post_id" : "<?php echo $post_id; ?>", 853 "auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>",853 "auth_cookie" : "<?php if ( is_ssl() ) echo $_COOKIE[SECURE_AUTH_COOKIE]; else echo $_COOKIE[AUTH_COOKIE]; ?>", 854 854 "_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>", 855 855 "type" : "<?php echo $type; ?>", -
trunk/wp-includes/pluggable.php
r8164 r8190 590 590 $logged_in_cookie = wp_generate_auth_cookie($user_id, $expiration, 'logged_in'); 591 591 592 do_action('set_auth_cookie', $auth_cookie, $expire, $ scheme);593 do_action('set_ auth_cookie', $logged_in_cookie, $expire, 'logged_in');592 do_action('set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme); 593 do_action('set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in'); 594 594 595 595 setcookie($auth_cookie_name, $auth_cookie, $expire, SITECOOKIEPATH . 'wp-admin', COOKIE_DOMAIN, $secure); -
trunk/wp-login.php
r8069 r8190 412 412 $redirect_to = 'wp-admin/'; 413 413 414 if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) )414 if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ) 415 415 $secure_cookie = false; 416 416 else
Note: See TracChangeset
for help on using the changeset viewer.