summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/template-loader.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-10-24 14:21:13 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-10-24 14:21:13 +0000
commit797aff459d87aa09fe0c0c9a7aaf288752b5bd15 (patch)
tree9903b14c48e73bf9d77dd0d6a32e81a0deda3bea /wp-inst/wp-includes/template-loader.php
parent8a9ee3b40641ff572b10c53e9aae1a148e1e8a38 (diff)
downloadwordpress-mu-797aff459d87aa09fe0c0c9a7aaf288752b5bd15.tar.gz
wordpress-mu-797aff459d87aa09fe0c0c9a7aaf288752b5bd15.tar.xz
wordpress-mu-797aff459d87aa09fe0c0c9a7aaf288752b5bd15.zip
Massive WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@407 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 07bda7c..6678027 100644
--- a/wp-inst/wp-includes/template-loader.php
+++ b/wp-inst/wp-includes/template-loader.php
@@ -1,5 +1,4 @@
<?php
-
if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
do_action('template_redirect');
if ( is_feed() ) {
@@ -17,10 +16,17 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
} else if ( is_home() && get_home_template() ) {
include(get_home_template());
exit;
+ } else if ( is_subpost() && get_subpost_template() ) {
+ include(get_subpost_template());
+ exit;
} else if ( is_single() && get_single_template() ) {
+ if ( is_subpost() )
+ add_filter('the_content', 'prepend_object');
include(get_single_template());
exit;
} else if ( is_page() && get_page_template() ) {
+ if ( is_subpost() )
+ add_filter('the_content', 'prepend_object');
include(get_page_template());
exit;
} else if ( is_category() && get_category_template()) {
@@ -56,4 +62,4 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
}
}
-?> \ No newline at end of file
+?>