Ticket #23155: 23155.diff

wp-includes/ms-blogs.php

@@ -687 +687 @@
                 ( $value == 1 ) ? do_action( 'archive_blog', $blog_id ) : do_action( 'unarchive_blog', $blog_id );
         elseif ( 'deleted' == $pref )
                 ( $value == 1 ) ? do_action( 'make_delete_blog', $blog_id ) : do_action( 'make_undelete_blog', $blog_id );
+        elseif ( 'public' == $pref )
+                do_action( 'update_blog_public', $blog_id ); // Moved here from update_blog_public().
 
         return $value;
 }

wp-includes/general-template.php

@@ -1705 +1705 @@
  * @since 2.1.0
  */
 function noindex() {
+        $public = get_option( 'blog_public' );
+
+        if ( is_multisite() ) {
+                // Compare local and global and override with the local setting if they
+                // don't match.
+
+                global $current_blog;
+
+                if ( ( '' != $public ) && ( $public != $current_blog->public ) ) {
+                        update_blog_status( get_current_blog_id(), 'public', $public );
+                        $current_blog->public = $public;
+                }
+        }
+
         // If the blog is not public, tell robots to go away.
-        if ( '0' == get_option('blog_public') )
+        if ( '0' == $public )
                 wp_no_robots();
 }
 

wp-includes/ms-functions.php

@@ -1770 +1770 @@
  * @return bool
  */
 function update_blog_public( $old_value, $value ) {
-        global $wpdb;
-        do_action('update_blog_public');
-        update_blog_status( $wpdb->blogid, 'public', (int) $value );
+        update_blog_status( get_current_blog_id(), 'public', (int) $value );
 }
 add_action('update_option_blog_public', 'update_blog_public', 10, 2);