Ticket #27264: 27264.diff

src/wp-includes/ms-load.php

@@ -394 +394 @@
  *
  * @access private
  * @since 3.0.0
+ *
+ * @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;
 
         wp_load_translations_early();
 

src/wp-includes/ms-settings.php

@@ -77 +77 @@
                                 $current_site = wp_get_network( $one_network );
                                 wp_cache_set( 'current_network', 'site-options' );
                         } elseif ( 0 === $wpdb->num_rows ) {
-                                ms_not_installed();
+                                ms_not_installed( $domain, $path );
                         }
                 }
                 if ( empty( $current_site ) ) {
@@ -85 +85 @@
                 }
 
                 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 {
@@ -110 +110 @@
 
         // If we don't have a network by now, we have a problem.
         if ( empty( $current_site ) ) {
-                ms_not_installed();
+                ms_not_installed( $domain, $path );
         }
 
         // @todo What if the domain of the network doesn't match the current site?
@@ -154 +154 @@
                                 header( 'Location: http://' . $current_site->domain . $current_site->path );
                                 exit;
                         }
-                        ms_not_installed();
+                        ms_not_installed( $domain, $path );
                 }
         }