Changeset 33989 for trunk/src/wp-includes/ms-settings.php

Timestamp:

09/10/2015 03:52:21 AM (9 years ago)

Author:

jeremyfelt

Message:

Multisite: Remove $domain and $path globals in ms_not_installed()

Further reduces the reliance on these unnecessary globals.

Fixes #27264.

File:

• trunk/src/wp-includes/ms-settings.php (modified) (4 diffs)

trunk/src/wp-includes/ms-settings.php

@@ -79 +79 @@
                 wp_cache_add( 'current_network', $current_site, 'site-options' );
             } elseif ( 0 === $wpdb->num_rows ) {
-                ms_not_installed();
+                ms_not_installed( $domain, $path );
             }
         }
@@ -87 +87 @@
 
         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 );
@@ -112 +112 @@
     // No network has been found, bail.
     if ( empty( $current_site ) ) {
-        ms_not_installed();
+        ms_not_installed( $domain, $path );
     }
 
@@ -157 +157 @@
              * As we couldn't find a site, we're simply not installed.
              */
-            ms_not_installed();
+            ms_not_installed( $domain, $path );
         }