Changeset 35782

Timestamp:

12/06/2015 06:23:18 PM (9 years ago)

Author:

jeremyfelt

Message:

MS: Populate public on empty $current_blog during subdomain activation.

Activation of a subdomain site is done through that new site's address. This address does not exist in the wp_blogs table until activation is complete.

In this case we need to make sure public is populated to avoid a PHP notice.

Props uglyrobot.
Fixes #24760.

File:

• trunk/src/wp-includes/ms-settings.php (modified) (1 diff)

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

@@ -136 +136 @@
     }
 
-    // @todo Investigate when exactly this can occur.
+    // During activation of a new subdomain, the requested site does not yet exist.
     if ( empty( $current_blog ) && wp_installing() ) {
         $current_blog = new stdClass;
         $current_blog->blog_id = $blog_id = 1;
+        $current_blog->public = 1;
     }