From ce2ed91698c34b11f4873ccce03795338d337a0d Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 24 Jun 2008 17:36:21 +0000
Subject: [PATCH] wp_guess_url() and install styling fixes from sambauers.
 fixes #7129 see #4732

git-svn-id: http://svn.automattic.com/wordpress/trunk@8182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/schema.php  |  5 ++---
 wp-admin/includes/upgrade.php |  7 +------
 wp-includes/functions.php     | 10 ++++++++++
 wp-includes/script-loader.php |  8 ++++++--
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index d796eadb5..0038776b9 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -153,9 +153,8 @@ CREATE TABLE $wpdb->usermeta (
 
 function populate_options() {
 	global $wpdb, $wp_db_version;
-
-	$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');
 	
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index ae9e04cb8..26122ffef 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);
 
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 05d705234..d2132839b 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2126,4 +2126,14 @@ function force_ssl_admin($force = '') {
 	return $forced;
 }
 
+function wp_guess_url() {
+	if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+		$url = WP_SITEURL;
+	} else {
+		$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+		$url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+	}
+	return $url;
+}
+
 ?>
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index c9a052ca9..7511264f0 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -7,7 +7,9 @@ require( ABSPATH . WPINC . '/class.wp-styles.php' );
 require( ABSPATH . WPINC . '/functions.wp-styles.php' );
 
 function wp_default_scripts( &$scripts ) {
-	$scripts->base_url = site_url();
+	if (!$guessurl = site_url())
+		$guessurl = wp_guess_url();
+	$scripts->base_url = $guessurl;
 	$scripts->default_version = get_bloginfo( 'version' );
 
 	$scripts->add( 'common', '/wp-admin/js/common.js', array('jquery'), '20080318' );
@@ -203,7 +205,9 @@ function wp_default_scripts( &$scripts ) {
 }
 
 function wp_default_styles( &$styles ) {
-	$styles->base_url = site_url();
+	if (!$guessurl = site_url())
+		$guessurl = wp_guess_url();
+	$styles->base_url = $guessurl;
 	$styles->default_version = get_bloginfo( 'version' );
 	$styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';