<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[11814] trunk/wp-includes/theme.php:
Support location of category templates based on category slug as well as id
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11814">11814</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-08-14 16:56:51 +0000 (Fri, 14 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support location of category templates based on category slug as well as id. Fixes <a href="http://trac.wordpress.org/ticket/10614">#10614</a> based on patch from scribu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (11813 => 11814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2009-08-14 16:43:22 UTC (rev 11813)
+++ trunk/wp-includes/theme.php 2009-08-14 16:56:51 UTC (rev 11814)
</span><span class="lines">@@ -590,9 +590,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve path of category template in current or parent template.
</span><span class="cx"> *
</span><del>- * 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.
</del><ins>+ * 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.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @uses apply_filters() Calls 'category_template' on file path of category template.
</span><span class="lines">@@ -600,7 +600,18 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_category_template() {
</span><del>- $template = locate_template(array("category-" . absint( get_query_var('cat') ) . '.php', 'category.php'));
</del><ins>+ $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);
</ins><span class="cx"> return apply_filters('category_template', $template);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>