diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-11-16 10:48:07 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-11-16 10:48:07 +0000 |
| commit | 32073e7f2d49bed8cd3776f5b257dfaa6ba57f73 (patch) | |
| tree | 4b4b19ff08ebadbf971be208291d9e60bb932486 /wp-login.php | |
| parent | a58e68f1fc7ee42c416a3fbe72ec32742f28f586 (diff) | |
| download | wordpress-mu-32073e7f2d49bed8cd3776f5b257dfaa6ba57f73.tar.gz wordpress-mu-32073e7f2d49bed8cd3776f5b257dfaa6ba57f73.tar.xz wordpress-mu-32073e7f2d49bed8cd3776f5b257dfaa6ba57f73.zip | |
Backing out 1144
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1150 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-login.php')
| -rw-r--r-- | wp-login.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-login.php b/wp-login.php index 87f13df..9eacdb0 100644 --- a/wp-login.php +++ b/wp-login.php @@ -11,11 +11,11 @@ nocache_headers(); header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset')); -$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; if ( defined('RELOCATE') ) { // Move flag is set if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] ); + $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; if ( dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_option('siteurl') ) update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); } @@ -270,7 +270,7 @@ default: login_header(__('Login')); ?> -<form name="loginform" id="loginform" action="<?php echo $schema . $current_blog->domain . $current_blog->path ?>wp-login.php" method="post"> +<form name="loginform" id="loginform" action="http://<?php echo $current_blog->domain . $current_blog->path ?>wp-login.php" method="post"> <?php if ( !in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?> <p> <label><?php _e('Username:') ?><br /> |