Ticket #19063: new.diff

general-template.php

@@ -123 +123 @@
         if ( isset($name) )
                 $templates[] = "{$slug}-{$name}.php";
 
+        if (get_post_type() == false) {
+                $term = get_queried_object();
+                $type = $term->taxonomy;
+        }
+        else {
+                $type = get_query_var('post_type');
+        }
+
+        $default_types = array('post', 'page', 'attachment', 'category', 'post_tag', 'link_category', 'post_format');
+        if (!in_array($type, $default_types)) {
+                if (isset($name)) {
+                        $templates[] = "$slug-$name-$type.php";
+                }
+                $templates[] = "$slug-$type.php";
+        }
+
         $templates[] = "{$slug}.php";
 
-        locate_template($templates, true, false);
+        $template = locate_template($templates);
+
+        if (!in_array($type, $default_types)) {
+                $template = apply_filters('get_custom_template_part', $template, $type, $slug, $name);
+        }
+
+        load_template($template, false);
 }
 
 /**