Changeset 15680 for trunk/wp-includes/load.php

Timestamp:

10/02/2010 03:08:02 AM (14 years ago)

Author:

dd32

Message:

utilise wp_guess_url() in installation redirection to provide an Absolute URL. See #14062. See #14904

File:

• trunk/wp-includes/load.php (modified) (1 diff)

trunk/wp-includes/load.php

@@ -420 +420 @@
             wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
     } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
-        if ( defined( 'WP_SITEURL' ) )
-            $link = WP_SITEURL . '/wp-admin/install.php';
-        elseif ( false !== strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) )
-            $link = preg_replace( '|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
-        else
-            $link = preg_replace( '|/[^/]+?$|', '/', $_SERVER['PHP_SELF'] ) . 'wp-admin/install.php';
+
+        $link = wp_guess_url() . '/wp-admin/install.php';
+
         require( ABSPATH . WPINC . '/kses.php' );
         require( ABSPATH . WPINC . '/pluggable.php' );