Ticket #21143: 21143.diff

src/wp-includes/ms-settings.php

@@ -130 +130 @@
                 }
         }
 
+        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;
-
-                } elseif ( is_subdomain_install() ) {
+                if ( 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;
+                                        $destination = 'http://' . $current_site->domain . $current_site->path;
                                 } else {
                                         $destination = NOBLOGREDIRECT;
                                 }
@@ -146 +147 @@
                         } else {
                                 $destination = 'http://' . $current_site->domain . $current_site->path . 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
                         }
-                        header( 'Location: ' . $destination );
-                        exit;
-
                 } else {
                         if ( 0 !== strcasecmp( $current_site->domain, $domain ) ) {
-                                header( 'Location: http://' . $current_site->domain . $current_site->path );
-                                exit;
+                                $destination = 'http://' . $current_site->domain . $current_site->path;
+                        } else {
+                                ms_not_installed(); // Uses wp_die();
                         }
-                        ms_not_installed();
                 }
+
+                /**
+                 * Fires before redirect when a site cannot be found to fill $current_blog.
+                 *
+                 * @since 3.9.0
+                 *
+                 * @param string $destination Current destination URL for redirect.
+                 * @param string $domain      Originally requested domain.
+                 * @param string $path        Originally requested path.
+                 */
+                do_action( 'site_not_found', $destination, $domain, $path );
+
+                header( 'Location: ' . $destination );
+                exit;
         }
 
         $blog_id = $current_blog->blog_id;