Ticket #20037: patch.patch

wp-includes/default-filters.php

@@ -204 +204 @@
 add_action( 'wp_head',             'adjacent_posts_rel_link_wp_head', 10, 0 );
 add_action( 'wp_head',             'locale_stylesheet'                      );
 add_action( 'publish_future_post', 'check_and_publish_future_post',   10, 1 );
-add_action( 'wp_head',             'noindex',                          1    );
+add_action( 'wp_head',             'wp_no_robots',                     1    );
 add_action( 'wp_head',             'wp_print_styles',                  8    );
 add_action( 'wp_head',             'wp_print_head_scripts',            9    );
 add_action( 'wp_head',             'wp_generator'                           );

wp-includes/general-template.php

@@ -1715 +1715 @@
  *
  * @since 3.3.0
  */
-function wp_no_robots() {
-        echo "<meta name='robots' content='noindex,nofollow' />\n";
+function wp_no_robots() {               
+        
+        global $wp_query;
+        $post = $wp_query->get_queried_object();        
+
+        if ( !$post || '0' == get_option('blog_public') )
+                $robots_meta = 'noindex,nofollow';              
+        elseif ( is_single() || is_page() || is_home() )
+                $robots_meta = "all,noodp,noydir";
+        elseif ( is_archive() || is_search() || is_404() )
+                $robots_meta = "follow,noindex";
+        else
+                $robots_meta = '';      
+        
+        $robots_meta = apply_filters( 'wp_no_robots' , $robots_meta , $post );
+        
+        if ( $robots_meta != '' )
+                echo "<meta name='robots' content='".$robots_meta."' />\n";     
 }
 
 /**