Ticket #19251: 19251.diff

wp-includes/default-filters.php

@@ -218 +218 @@
 add_action( 'init',                'check_theme_switched',            99    );
 add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
 
-if ( isset( $_GET['replytocom'] ) )
-    add_filter( 'pre_option_blog_public', '__return_zero' );
+add_filter( 'option_blog_public', '_maybe_disallow_crawling' );
 
 // Login actions
 add_action( 'login_head',          'wp_print_head_scripts',         9     );

wp-includes/functions.php

@@ -4633 +4633 @@
         return $protocols;
 }
 
+/**
+ * Disallow crawling of particular pages for certain conditions.
+ *
+ * This function runs as a filter on option_blog_public. When the disallow_crawling
+ * filter returns true, the blog_public option will be set to 0 for the duration of the
+ * active request. blog_public is set to 0 only if it is currently set to 1. This avoids
+ * stomping custom values used by plugins.
+ *
+ * @param int $blog_public The current value of the blog_public option
+ * @return int The new blog_public value.
+ */
+function _maybe_disallow_crawling( $blog_public ) {
+        // By default, disallow crawling of replytocom requests.
+        $disallow = isset( $_GET['replytocom'] ) ? true : false;
+
+        $disallow = apply_filters( 'disallow_crawling', $disallow );
+
+        if ( ! $disallow )
+                return $blog_public;
+
+        return ( 1 !== (int) $blog_public ) ? $blog_public : 0;
+}
+
 ?>