Ticket #19251: 19251.2.diff

wp-signup.php

@@ -3 +3 @@
 /** Sets up the WordPress Environment. */
 require( dirname(__FILE__) . '/wp-load.php' );
 
-add_action( 'wp_head', 'signuppageheaders' ) ;
+add_action( 'wp_head', '_wp_render_meta_robots_noindex' );
 
 require( './wp-blog-header.php' );
 
@@ -17 +17 @@
 }
 add_action( 'wp_head', 'do_signup_header' );
 
-function signuppageheaders() {
-        echo "<meta name='robots' content='noindex,nofollow' />\n";
-}
-
 if ( !is_multisite() ) {
         wp_redirect( site_url('wp-login.php?action=register') );
         die();

wp-login.php

@@ -42 +42 @@
         global $error, $is_iphone, $interim_login, $current_site;
 
         // Don't index any of these forms
-        add_filter( 'pre_option_blog_public', '__return_zero' );
-        add_action( 'login_head', 'noindex' );
+        add_action( 'login_head', '_wp_render_meta_robots_noindex' );
 
         if ( empty($wp_error) )
                 $wp_error = new WP_Error();

wp-includes/default-filters.php

@@ -219 +219 @@
 add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
 
 if ( isset( $_GET['replytocom'] ) )
-    add_filter( 'pre_option_blog_public', '__return_zero' );
+    add_filter( 'wp_head', '_wp_render_meta_robots_noindex' );
 
 // Login actions
 add_action( 'login_head',          'wp_print_head_scripts',         9     );

wp-includes/functions.php

@@ -1849 +1849 @@
 
         $output = "User-agent: *\n";
         $public = get_option( 'blog_public' );
-        if ( '0' ==  $public ) {
+        if ( '0' == $public ) {
                 $output .= "Disallow: /\n";
         } else {
                 $site_url = parse_url( site_url() );

wp-includes/general-template.php

@@ -1684 +1684 @@
 function noindex() {
         // If the blog is not public, tell robots to go away.
         if ( '0' == get_option('blog_public') )
-                echo "<meta name='robots' content='noindex,nofollow' />\n";
+                _wp_render_meta_robots_noindex();
 }
 
+function _wp_render_meta_robots_noindex() {
+        echo "<meta name='robots' content='noindex,nofollow' />\n";
+}
+
 /**
  * Determine if TinyMCE is available.
  *

wp-admin/options-writing.php

@@ -157 +157 @@
 <?php if ( apply_filters( 'enable_update_services_configuration', true ) ) { ?>
 <h3><?php _e('Update Services') ?></h3>
 
-<?php if ( get_option('blog_public') ) : ?>
+<?php if ( 1 == get_option('blog_public') ) : ?>
 
 <p><label for="ping_sites"><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></label></p>