Ticket #21143: 21143.3.diff

src/wp-includes/ms-settings.php

@@ -110 +110 @@
 
         // If we don't have a network by now, we have a problem.
         if ( empty( $current_site ) ) {
+                /**
+                 * Fires before ms_not_installed() when a network cannot be found to
+                 * fill $current_site.
+                 *
+                 * @since 3.9.0
+                 *
+                 * @param string $domain      Originally requested domain.
+                 * @param string $path        Originally requested path.
+                 */
+                do_action( 'network_not_found', $domain, $path );
+
                 ms_not_installed();
         }
 
@@ -130 +141 @@
                 }
         }
 
+        if ( defined( 'WP_INSTALLING' ) && empty( $current_blog ) ) {
+                $current_blog->blog_id = $blog_id = 1;
+        }
+
         // If we haven't figured out our site, give up.
         if ( empty( $current_blog ) ) {
-                if ( defined( 'WP_INSTALLING' ) ) {
-                        $current_blog->blog_id = $blog_id = 1;
+                /**
+                 * Fires before redirect or ms_not_installed when a site cannot be
+                 * found to fill $current_blog.
+                 *
+                 * @since 3.9.0
+                 *
+                 * @param object $current_site Contains network properties.
+                 * @param string $domain       Originally requested domain.
+                 * @param string $path         Originally requested path.
+                 */
+                do_action( 'site_not_found', $current_site, $domain, $path );
 
-                } elseif ( is_subdomain_install() ) {
-                        // @todo This is only for an open registration subdomain network.
-                        if ( defined( 'NOBLOGREDIRECT' ) ) {
-                                if ( '%siteurl%' === NOBLOGREDIRECT ) {
-                                        $destination = "http://" . $current_site->domain . $current_site->path;
-                                } else {
-                                        $destination = NOBLOGREDIRECT;
-                                }
+                if ( is_subdomain_install() ) {
+                        $wpdb->set_blog_id( 0, $current_site->id );
+
+                        if ( defined( 'NOBLOGREDIRECT' ) && '%siteurl%' !== NOBLOGREDIRECT ) {
+                                $destination = NOBLOGREDIRECT;
+                        } elseif ( 'none' !== get_site_option( 'registration', 'none' ) ) {
+                                // Only redirect to signup if registrations of some form are enabled.
+                                $destination = 'http://' . $current_site->domain . $current_site->path . 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
                         } else {
-                                $destination = 'http://' . $current_site->domain . $current_site->path . 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
+                                $destination = 'http://' . $current_site->domain . $current_site->path;
                         }
                         header( 'Location: ' . $destination );
                         exit;
-
+                } elseif ( 0 !== strcasecmp( $current_site->domain, $domain ) ) {
+                        header( 'Location: http://' . $current_site->domain . $current_site->path );
+                        exit;
                 } else {
-                        if ( 0 !== strcasecmp( $current_site->domain, $domain ) ) {
-                                header( 'Location: http://' . $current_site->domain . $current_site->path );
-                                exit;
-                        }
                         ms_not_installed();
                 }
         }