Changeset 11814

Timestamp:

08/14/2009 04:56:51 PM (16 years ago)

Author:

westi

Message:

Support location of category templates based on category slug as well as id. Fixes #10614 based on patch from scribu.

File:

• trunk/wp-includes/theme.php (modified) (2 diffs)

trunk/wp-includes/theme.php

@@ -591 +591 @@
  * Retrieve path of category template in current or parent template.
  *
- * Works by retrieving the current category ID, for example 'category-1.php' and
- * will fallback to category.php template, if the ID category file doesn't
- * exist.
+ * Works by first retrieving the current slug for example 'category-default.php' and then
+ * trying category ID, for example 'category-1.php' and will finally fallback to category.php
+ * template, if those files don't exist.
  *
  * @since 1.5.0
@@ -601 +601 @@
  */
 function get_category_template() {
-    $template = locate_template(array("category-" . absint( get_query_var('cat') ) . '.php', 'category.php'));
+    $cat_ID = absint( get_query_var('cat') );
+    $category = get_category( $cat_ID );
+
+    $templates = array();
+    
+    if ( !is_wp_error($category) )
+        $templates[] = "category-{$category->slug}.php";
+
+    $templates[] = "category-$cat_ID.php";
+    $templates[] = "category.php";  
+    
+    $template = locate_template($templates);
     return apply_filters('category_template', $template);
 }