Changeset 25292 for trunk/src/wp-includes/template-loader.php

Timestamp:

09/06/2013 11:38:51 PM (11 years ago)

Author:

wonderboymusic

Message:

Check the value passed to get_post_type_object(). If it's an array, use the first item. get_query_var( 'post_type' ) can be an array if the query has been altered via filters/actions. There are several places in core that pass the query var. Adds unit tests.

In template-loader.php, move is_post_type_archive() and is_tax() directly below is_home().

See #18614, [25291].

File:

• trunk/src/wp-includes/template-loader.php (modified) (1 diff)

trunk/src/wp-includes/template-loader.php

@@ -27 +27 @@
     if     ( is_404()            && $template = get_404_template()            ) :
     elseif ( is_search()         && $template = get_search_template()         ) :
-    elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) : 
-    elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
     elseif ( is_front_page()     && $template = get_front_page_template()     ) :
     elseif ( is_home()           && $template = get_home_template()           ) :
+    elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
+    elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
     elseif ( is_attachment()     && $template = get_attachment_template()     ) :
         remove_filter('the_content', 'prepend_attachment');