Changeset 24559

Timestamp:

07/05/2013 03:17:31 PM (11 years ago)

Author:

ryan

Message:

Don't sync the blog public option from noindex(). This can cause race conditions.

fixes #23155

File:

• trunk/wp-includes/general-template.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -1735 +1735 @@
  */
 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' == $public )
+    if ( '0' == get_option('blog_public') )
         wp_no_robots();
 }