Ticket #21143: 21143_2.diff

ms-settings.php

@@ -49 +49 @@
         if ( ! isset( $current_site->blog_id ) )
                 $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
 
+        $blogname = null;
         if ( is_subdomain_install() ) {
                 $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
                 if ( !$current_blog ) {
@@ -80 +81 @@
                 unset($reserved_blognames);
         }
 
+        if ( ! defined( 'WP_INSTALLING' ) && ! is_object( $current_blog ) ) {
+                do_action('blog_not_found', $domain, $path, $blogname, $current_site );
+        }
+
         if ( ! defined( 'WP_INSTALLING' ) && is_subdomain_install() && ! is_object( $current_blog ) ) {
                 if ( defined( 'NOBLOGREDIRECT' ) ) {
                         $destination = NOBLOGREDIRECT;