Changeset 23794

Timestamp:

03/25/2013 09:29:58 AM (13 years ago)

Author:

ryan

Message:

Fire the update_blog_public action from update_blog_status() instead of update_blog_public(). Pass blog ID and value to the action.

Add code to noindex() to sync the 'public' value in the site options table with the blog_public value in the options table.

fixes #23155

Location:

trunk/wp-includes

Files:

• general-template.php (modified) (1 diff)
• ms-blogs.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -1704 +1704 @@
  */
 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();
 }

trunk/wp-includes/ms-blogs.php

@@ -696 +696 @@
     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, $value ); // Moved here from update_blog_public().
 
     return $value;

trunk/wp-includes/ms-functions.php

@@ -1735 +1735 @@
  */
 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);