Changeset 3791

Timestamp:

05/22/2006 10:06:06 PM (19 years ago)

Author:

ryan

Message:

Handle robots.txt requests and obey blog_plubic setting.

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• default-filters.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• query.php (modified) (4 diffs)
• rewrite.php (modified) (2 diffs)
• template-loader.php (modified) (2 diffs)

trunk/wp-includes/classes.php

@@ -74 +74 @@
 
 class WP {
-    var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview');
+    var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 's', 'search', 'exact', 'sentence', 'debug', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots');
 
     var $private_query_vars = array('posts_per_page', 'posts_per_archive_page', 'what_to_show', 'showposts', 'nopaging', 'post_type');

trunk/wp-includes/default-filters.php

@@ -95 +95 @@
 add_action('do_feed_atom', 'do_feed_atom', 10, 1);
 add_action('do_pings', 'do_all_pings', 10, 1);
+add_action('do_robots', 'do_robots');
 ?>

trunk/wp-includes/functions.php

@@ -1656 +1656 @@
 }
 
+function do_robots() {
+    if ( '1' != get_option('blog_public') ) {
+        echo "User-agent: *\n";
+        echo "Disallow: /\n";
+    } else {
+        echo "User-agent: *\n";
+        echo "Disallow:\n";
+    }
+}
+
 function is_blog_installed() {
     global $wpdb;

trunk/wp-includes/query.php

@@ -156 +156 @@
 
     return $wp_query->is_preview;
+}
+
+function is_robots() {
+    global $wp_query;
+
+    return $wp_query->is_robots;
 }
 
@@ -273 +279 @@
     var $is_admin = false;
     var $is_attachment = false;
+    var $is_robots = false;
 
     function init_query_flags() {
@@ -293 +300 @@
         $this->is_admin = false;
         $this->is_attachment = false;
+        $this->is_robots = false;
     }
 
@@ -320 +328 @@
             $this->query = $query;
             $this->query_vars = $qv;
+        }
+
+        if ( ! empty($qv['robots']) ) {
+            $this->is_robots = true;
+            return;
         }
 

trunk/wp-includes/rewrite.php

@@ -697 +697 @@
         }
 
+        // robots.txt
+        $robots_rewrite = array('robots.txt$' => $this->index . '?robots=1');
+
         // Post
         $post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
@@ -731 +734 @@
 
         // Put them together.
-        $this->rules = array_merge($page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+        $this->rules = array_merge($robots_rewrite, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
 
         do_action('generate_rewrite_rules', array(&$this));

trunk/wp-includes/template-loader.php

@@ -2 +2 @@
 if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
     do_action('template_redirect');
-    if ( is_feed() ) {
+    if ( is_robots() ) {
+        do_action('do_robots');
+        exit;
+    } else if ( is_feed() ) {
         do_feed();
         exit;
@@ -56 +59 @@
 } else {
     // Process feeds and trackbacks even if not using themes.
-    if ( is_feed() ) {
+    if ( is_robots() ) {
+        do_action('do_robots');
+        exit;
+    } else if ( is_feed() ) {
         do_feed();
         exit;