Ticket #3790: 3790.diff

wp-includes/template-loader.php

@@ -3 +3 @@
         do_action('template_redirect');
         if ( is_robots() ) {
                 do_action('do_robots');
-                exit;
+                return;
         } else if ( is_feed() ) {
                 do_feed();
-                exit;
+                return;
         } else if ( is_trackback() ) {
                 include(ABSPATH . '/wp-trackback.php');
-                exit;
+                return;
         } else if ( is_404() && $template = get_404_template() ) {
                 include($template);
-                exit;
+                return;
         } else if ( is_search() && $template = get_search_template() ) {
                 include($template);
-                exit;
+                return;
         } else if ( is_home() && $template = get_home_template() ) {
                 include($template);
-                exit;
+                return;
         } 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);
-                exit;
+                return;
         } 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);
-                exit;
+                return;
         } else if ( is_author() && $template = get_author_template() ) {
                 include($template);
-                exit;
+                return;
         } else if ( is_date() && $template = get_date_template() ) {
                 include($template);
-                exit;
+                return;
         } else if ( is_archive() && $template = get_archive_template() ) {
                 include($template);
-                exit;
+                return;
         } else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
                 include($template);
-                exit;
+                return;
         } 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");
-                exit;
+                return;
         }
 } else {
         // Process feeds and trackbacks even if not using themes.
         if ( is_robots() ) {
                 do_action('do_robots');
-                exit;
+                return;
         } else if ( is_feed() ) {
                 do_feed();
-                exit;
+                return;
         } else if ( is_trackback() ) {
                 include(ABSPATH . '/wp-trackback.php');
-                exit;
+                return;
         }
 }