SSL fixes. see #7001

git-svn-id: https://develop.svn.wordpress.org/trunk@8190 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-06-24 22:19:27 +00:00
parent 29dcc51d1f
commit 3f0d3c8055
4 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -411,7 +411,7 @@ default:
else
$redirect_to = 'wp-admin/';
if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) )
if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
$secure_cookie = false;
else
$secure_cookie = '';