diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-11 11:27:43 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-11-11 11:27:43 +0000 |
| commit | b92deb93cf1b425d3b0da113dce719ff3e7af839 (patch) | |
| tree | 4579958b1d0169cf8d86ad2e55286c7b5be90148 /wp-inst/wp-admin/install.php | |
| parent | aa750edffae8aeb649b0b2f15900db988e588de7 (diff) | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@430 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/install.php')
| -rw-r--r-- | wp-inst/wp-admin/install.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wp-inst/wp-admin/install.php b/wp-inst/wp-admin/install.php index dd7380e..510b8aa 100644 --- a/wp-inst/wp-admin/install.php +++ b/wp-inst/wp-admin/install.php @@ -6,7 +6,8 @@ if (!file_exists('../wp-config.php')) require_once('../wp-config.php'); require_once('./upgrade-functions.php'); -$guessurl = str_replace('/wp-admin/install.php?step=2', '', 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) ); +$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; +$guessurl = str_replace('/wp-admin/install.php?step=2', '', $schema . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) ); if (isset($_GET['step'])) $step = $_GET['step']; |