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/includes/upgrade.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/includes/upgrade.php')
| -rw-r--r-- | wp-admin/includes/upgrade.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 07a4f9f..3d5ce74 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -21,12 +21,7 @@ function wp_install($blog_title, $user_name, $user_email, $public, $remote) { update_option('enable_app',$remote); update_option('enable_xmlrpc',$remote); - $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; - - if ( defined('WP_SITEURL') && '' != WP_SITEURL ) - $guessurl = WP_SITEURL; - else - $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); + $guessurl = wp_guess_url(); update_option('siteurl', $guessurl); @@ -889,7 +884,7 @@ function deslash($content) { function dbDelta($queries, $execute = true) { global $wpdb; - // Seperate individual queries into an array + // Separate individual queries into an array if( !is_array($queries) ) { $queries = explode( ';', $queries ); if('' == $queries[count($queries) - 1]) array_pop($queries); |