Return instead of exit in template-loader. Props Otto42 and Nazgul. fixes #3790
git-svn-id: https://develop.svn.wordpress.org/trunk@5104 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
6f23fb8858
commit
7d8f8b40f2
|
@ -3,70 +3,70 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
|
||||||
do_action('template_redirect');
|
do_action('template_redirect');
|
||||||
if ( is_robots() ) {
|
if ( is_robots() ) {
|
||||||
do_action('do_robots');
|
do_action('do_robots');
|
||||||
exit;
|
return;
|
||||||
} else if ( is_feed() ) {
|
} else if ( is_feed() ) {
|
||||||
do_feed();
|
do_feed();
|
||||||
exit;
|
return;
|
||||||
} else if ( is_trackback() ) {
|
} else if ( is_trackback() ) {
|
||||||
include(ABSPATH . '/wp-trackback.php');
|
include(ABSPATH . '/wp-trackback.php');
|
||||||
exit;
|
return;
|
||||||
} else if ( is_404() && $template = get_404_template() ) {
|
} else if ( is_404() && $template = get_404_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_search() && $template = get_search_template() ) {
|
} else if ( is_search() && $template = get_search_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_home() && $template = get_home_template() ) {
|
} else if ( is_home() && $template = get_home_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_attachment() && $template = get_attachment_template() ) {
|
} else if ( is_attachment() && $template = get_attachment_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_single() && $template = get_single_template() ) {
|
} else if ( is_single() && $template = get_single_template() ) {
|
||||||
if ( is_attachment() )
|
if ( is_attachment() )
|
||||||
add_filter('the_content', 'prepend_attachment');
|
add_filter('the_content', 'prepend_attachment');
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_page() && $template = get_page_template() ) {
|
} else if ( is_page() && $template = get_page_template() ) {
|
||||||
if ( is_attachment() )
|
if ( is_attachment() )
|
||||||
add_filter('the_content', 'prepend_attachment');
|
add_filter('the_content', 'prepend_attachment');
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_category() && $template = get_category_template()) {
|
} else if ( is_category() && $template = get_category_template()) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_author() && $template = get_author_template() ) {
|
} else if ( is_author() && $template = get_author_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_date() && $template = get_date_template() ) {
|
} else if ( is_date() && $template = get_date_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_archive() && $template = get_archive_template() ) {
|
} else if ( is_archive() && $template = get_archive_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
|
} else if ( is_comments_popup() && $template = get_comments_popup_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( is_paged() && $template = get_paged_template() ) {
|
} else if ( is_paged() && $template = get_paged_template() ) {
|
||||||
include($template);
|
include($template);
|
||||||
exit;
|
return;
|
||||||
} else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
|
} else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
|
||||||
if ( is_attachment() )
|
if ( is_attachment() )
|
||||||
add_filter('the_content', 'prepend_attachment');
|
add_filter('the_content', 'prepend_attachment');
|
||||||
include(TEMPLATEPATH . "/index.php");
|
include(TEMPLATEPATH . "/index.php");
|
||||||
exit;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Process feeds and trackbacks even if not using themes.
|
// Process feeds and trackbacks even if not using themes.
|
||||||
if ( is_robots() ) {
|
if ( is_robots() ) {
|
||||||
do_action('do_robots');
|
do_action('do_robots');
|
||||||
exit;
|
return;
|
||||||
} else if ( is_feed() ) {
|
} else if ( is_feed() ) {
|
||||||
do_feed();
|
do_feed();
|
||||||
exit;
|
return;
|
||||||
} else if ( is_trackback() ) {
|
} else if ( is_trackback() ) {
|
||||||
include(ABSPATH . '/wp-trackback.php');
|
include(ABSPATH . '/wp-trackback.php');
|
||||||
exit;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue