Changeset 7491 for trunk/wp-includes/template-loader.php

Timestamp:

03/23/2008 05:02:11 PM (17 years ago)

Author:

ryan

Message:

Taxonomy queries and urls. Props andy. see #6357

File:

• trunk/wp-includes/template-loader.php (modified) (3 diffs)

trunk/wp-includes/template-loader.php

@@ -25 +25 @@
         return;
     } else if ( is_attachment() && $template = get_attachment_template() ) {
+        remove_filter('the_content', 'prepend_attachment');
         include($template);
         return;
     } else if ( is_single() && $template = get_single_template() ) {
-        if ( is_attachment() )
-            add_filter('the_content', 'prepend_attachment');
         include($template);
         return;
     } else if ( is_page() && $template = get_page_template() ) {
-        if ( is_attachment() )
-            add_filter('the_content', 'prepend_attachment');
         include($template);
         return;
@@ -41 +38 @@
         return;
     } else if ( is_tag() && $template = get_tag_template()) {
+        include($template);
+        return;
+    } else if ( is_tax() && $template = get_taxonomy_template()) {
         include($template);
         return;
@@ -59 +59 @@
         return;
     } else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
-        if ( is_attachment() )
-            add_filter('the_content', 'prepend_attachment');
         include(TEMPLATEPATH . "/index.php");
         return;