Changeset 8182

Timestamp:

06/24/2008 05:36:21 PM (15 years ago)

Author:

ryan

Message:

wp_guess_url() and install styling fixes from sambauers. fixes #7129 see #4732

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/includes/schema.php

@@ -154 +154 @@
 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');

trunk/wp-admin/includes/upgrade.php

@@ -22 +22 @@
     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);

trunk/wp-includes/functions.php

@@ -2127 +2127 @@
 }
 
+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;
+}
+
 ?>

trunk/wp-includes/script-loader.php

@@ -8 +8 @@
 
 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' );
 
@@ -204 +206 @@
 
 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';