Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-includes / template-loader.php

diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php
index ac69dab08cb0f52da2fb056a64a4478f974c8fe2..0c5a671c87acb7441d2639f4014f554974b34053 100644 (file)
--- a/wp-includes/template-loader.php
+++ b/wp-includes/template-loader.php
@@ -1,66 +1,75 @@
 <?php
 if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
        do_action('template_redirect');
 <?php
 if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
        do_action('template_redirect');

-       if ( is_feed() ) {
-               include(ABSPATH . '/wp-feed.php');
-               exit;
+       if ( is_robots() ) {
+               do_action('do_robots');
+               return;
+       } else if ( is_feed() ) {
+               do_feed();
+               return;

        } else if ( is_trackback() ) {
        } else if ( is_trackback() ) {

-               include(ABSPATH . '/wp-trackback.php');
-               exit;
+               include(ABSPATH . 'wp-trackback.php');
+               return;

        } else if ( is_404() && $template = get_404_template() ) {
                include($template);
        } else if ( is_404() && $template = get_404_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_search() && $template = get_search_template() ) {
                include($template);
        } else if ( is_search() && $template = get_search_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_home() && $template = get_home_template() ) {
                include($template);
        } else if ( is_home() && $template = get_home_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_attachment() && $template = get_attachment_template() ) {
                include($template);
        } else if ( is_attachment() && $template = get_attachment_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_single() && $template = get_single_template() ) {
                if ( is_attachment() )
                        add_filter('the_content', 'prepend_attachment');
                include($template);
        } else if ( is_single() && $template = get_single_template() ) {
                if ( is_attachment() )
                        add_filter('the_content', 'prepend_attachment');
                include($template);

-               exit;
+               return;

        } else if ( is_page() && $template = get_page_template() ) {
                if ( is_attachment() )
                        add_filter('the_content', 'prepend_attachment');
                include($template);
        } else if ( is_page() && $template = get_page_template() ) {
                if ( is_attachment() )
                        add_filter('the_content', 'prepend_attachment');
                include($template);

-               exit;
+               return;

        } else if ( is_category() && $template = get_category_template()) {
                include($template);
        } else if ( is_category() && $template = get_category_template()) {
                include($template);

-               exit;           
+               return;
+       } else if ( is_tag() && $template = get_tag_template()) {
+               include($template);
+               return;

        } else if ( is_author() && $template = get_author_template() ) {
                include($template);
        } else if ( is_author() && $template = get_author_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_date() && $template = get_date_template() ) {
                include($template);
        } else if ( is_date() && $template = get_date_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_archive() && $template = get_archive_template() ) {
                include($template);
        } else if ( is_archive() && $template = get_archive_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
                include($template);
        } else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( is_paged() && $template = get_paged_template() ) {
                include($template);
        } else if ( is_paged() && $template = get_paged_template() ) {
                include($template);

-               exit;
+               return;

        } else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
                if ( is_attachment() )
                        add_filter('the_content', 'prepend_attachment');
                include(TEMPLATEPATH . "/index.php");
        } else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
                if ( is_attachment() )
                        add_filter('the_content', 'prepend_attachment');
                include(TEMPLATEPATH . "/index.php");

-               exit;
+               return;

        }
 } else {
        // Process feeds and trackbacks even if not using themes.
        }
 } else {
        // Process feeds and trackbacks even if not using themes.

-       if ( is_feed() ) {
-               include(ABSPATH . '/wp-feed.php');
-               exit;
+       if ( is_robots() ) {
+               do_action('do_robots');
+               return;
+       } else if ( is_feed() ) {
+               do_feed();
+               return;

        } else if ( is_trackback() ) {
        } else if ( is_trackback() ) {

-               include(ABSPATH . '/wp-trackback.php');
-               exit;
+               include(ABSPATH . 'wp-trackback.php');
+               return;

        }
 }
 
        }
 }