diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index e067193f46..b296b4ce44 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -394,13 +394,15 @@ function get_site_by_path( $domain, $path, $segments = null ) { * * @access private * @since 3.0.0 + * @since 4.3.0 The `$domain` and `$path` parameters were added. * - * @global wpdb $wpdb - * @global string $domain - * @global string $path + * @global wpdb $wpdb + * + * @param string $domain The requested domain for the error to reference. + * @param string $path The requested path for the error to reference. */ -function ms_not_installed() { - global $wpdb, $domain, $path; +function ms_not_installed( $domain, $path ) { + global $wpdb; if ( ! is_admin() ) { dead_db(); diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php index 7b35e7616f..d7f42b367d 100644 --- a/wp-includes/ms-settings.php +++ b/wp-includes/ms-settings.php @@ -78,7 +78,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { $current_site = wp_get_network( $one_network ); wp_cache_add( 'current_network', $current_site, 'site-options' ); } elseif ( 0 === $wpdb->num_rows ) { - ms_not_installed(); + ms_not_installed( $domain, $path ); } } if ( empty( $current_site ) ) { @@ -86,7 +86,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { } if ( empty( $current_site ) ) { - ms_not_installed(); + ms_not_installed( $domain, $path ); } elseif ( $path === $current_site->path ) { $current_blog = get_site_by_path( $domain, $path ); } else { @@ -111,7 +111,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { // No network has been found, bail. if ( empty( $current_site ) ) { - ms_not_installed(); + ms_not_installed( $domain, $path ); } // @todo Investigate when exactly this can occur. @@ -156,7 +156,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { * it's no use redirecting back to ourselves -- it'll cause a loop. * As we couldn't find a site, we're simply not installed. */ - ms_not_installed(); + ms_not_installed( $domain, $path ); } header( 'Location: ' . $destination ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 85858f07d8..adef3aa9c1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-33988'; +$wp_version = '4.4-alpha-33989'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.