diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-13 17:21:00 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-13 17:21:00 +0000 |
| commit | 12de05107e4c8b006bde6ee8916f34eb476d08da (patch) | |
| tree | 123ee54ecd1f3f777373b7df54a4604012d43640 /wp-includes/template-loader.php | |
| parent | e51c7a9ca4bfdb45fa3ec7334bd33871e78c68b1 (diff) | |
| download | wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.gz wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.xz wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.zip | |
WP Merge with revision 8075
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/template-loader.php')
| -rw-r--r-- | wp-includes/template-loader.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php index eb44f68..e0647b0 100644 --- a/wp-includes/template-loader.php +++ b/wp-includes/template-loader.php @@ -20,6 +20,9 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) { } else if ( is_search() && $template = get_search_template() ) { include($template); return; + } else if ( is_tax() && $template = get_taxonomy_template()) { + include($template); + return; } else if ( is_home() && $template = get_home_template() ) { include($template); return; @@ -39,9 +42,6 @@ if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) { } else if ( is_tag() && $template = get_tag_template()) { include($template); return; - } else if ( is_tax() && $template = get_taxonomy_template()) { - include($template); - return; } else if ( is_author() && $template = get_author_template() ) { include($template); return; |