summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/template-loader.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-07 14:28:14 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-07 14:28:14 +0000
commit9d42ec4ee5db0437e9ad14b793f044fa0f5de8fe (patch)
treea0bb93e81f1856204377f936a97a8a285f77f2b7 /wp-inst/wp-includes/template-loader.php
parent16cdc878fce216364bd57f498baeeb1b94ca8662 (diff)
downloadwordpress-mu-9d42ec4ee5db0437e9ad14b793f044fa0f5de8fe.tar.gz
wordpress-mu-9d42ec4ee5db0437e9ad14b793f044fa0f5de8fe.tar.xz
wordpress-mu-9d42ec4ee5db0437e9ad14b793f044fa0f5de8fe.zip
WP Merge and new features
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@550 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/template-loader.php')
-rw-r--r--wp-inst/wp-includes/template-loader.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/wp-inst/wp-includes/template-loader.php b/wp-inst/wp-includes/template-loader.php
index 3f799e1..8b44d89 100644
--- a/wp-inst/wp-includes/template-loader.php
+++ b/wp-inst/wp-includes/template-loader.php
@@ -1,7 +1,10 @@
<?php
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;
} else if ( is_trackback() ) {
@@ -55,7 +58,10 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
}
} 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;
} else if ( is_trackback() ) {