From 541e47c09b503df8bd9b6d149c82cb8d98ac2710 Mon Sep 17 00:00:00 2001 From: donncha Date: Mon, 30 Jun 2008 11:17:02 +0000 Subject: WP Merge to revision 8195 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1342 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/includes/schema.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'wp-admin/includes/schema.php') diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index afaee6b..64b2eaf 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -229,8 +229,7 @@ CREATE TABLE IF NOT EXISTS $wpdb->signups ( function populate_options() { global $wpdb, $wp_db_version, $current_site; - $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; - $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); + $guessurl = wp_guess_url(); do_action('populate_options'); -- cgit