diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
| commit | 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch) | |
| tree | 2a06e5261263c68d8afd95a6328879dc289cb909 /wp-includes/template-loader.php | |
| parent | b83c34a7010faee0223f6037025c350da12e05e6 (diff) | |
| download | wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip | |
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/template-loader.php')
| -rw-r--r-- | wp-includes/template-loader.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php index 7b654b8..cc218e7 100644 --- a/wp-includes/template-loader.php +++ b/wp-includes/template-loader.php @@ -8,7 +8,7 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) { do_feed(); return; } else if ( is_trackback() ) { - include(ABSPATH . '/wp-trackback.php'); + include(ABSPATH . 'wp-trackback.php'); return; } else if ( is_404() && $template = get_404_template() ) { include($template); @@ -35,6 +35,9 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) { } else if ( is_category() && $template = get_category_template()) { include($template); return; + } else if ( is_tag() && $template = get_tag_template()) { + include($template); + return; } else if ( is_author() && $template = get_author_template() ) { include($template); return; @@ -65,7 +68,7 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) { do_feed(); return; } else if ( is_trackback() ) { - include(ABSPATH . '/wp-trackback.php'); + include(ABSPATH . 'wp-trackback.php'); return; } } |