Ticket #7129: wp_guess_url.patch

wp-includes/functions.php

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

wp-includes/script-loader.php

@@ -7 +7 @@
-require( ABSPATH . WPINC . '/functions.wp-styles.php' );
-
-function wp_default_scripts( &$scripts ) {
-
+
+
+
-        $scripts->default_version = get_bloginfo( 'version' );
-
-        $scripts->add( 'common', '/wp-admin/js/common.js', array('jquery'), '20080318' );
@@ -203 +205 @@
-}
-
-function wp_default_styles( &$styles ) {
-
+
+
+
-        $styles->default_version = get_bloginfo( 'version' );
-        $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
-

wp-admin/includes/schema.php

@@ -153 +153 @@
-
-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');
-        
-        add_option('siteurl', $guessurl);

wp-admin/includes/upgrade.php

@@ -18 +18 @@
-        update_option('blogname', $blog_title);
-        update_option('admin_email', $user_email);
-        update_option('blog_public', $public);
-        $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-
-
-
-
-
-
+
-        update_option('siteurl', $guessurl);
-
-        // If not a public blog, don't ping.