Changeset 33989

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.

Location:

trunk/src/wp-includes

Files:

• ms-load.php (modified) (1 diff)
• ms-settings.php (modified) (4 diffs)

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

@@ -395 +395 @@
  * @access private
  * @since 3.0.0
- *
- * @global wpdb   $wpdb
- * @global string $domain
- * @global string $path
- */
-function ms_not_installed() {
-    global $wpdb, $domain, $path;
+ * @since 4.3.0 The `$domain` and `$path` parameters were added.
+ *
+ * @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( $domain, $path ) {
+    global $wpdb;
 
     if ( ! is_admin() ) {

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 );
         }