<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[14660] trunk:
Do not show dummy default category output when calling the_category on a post_type that does not support the category taxonomy
(like pages).</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14660">14660</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-05-15 09:59:15 +0000 (Sat, 15 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not show dummy default category output when calling the_category on a post_type that does not support the category taxonomy (like pages). Fix TwentyTen theme to not display wrapping text if there are no categories. fixes <a href="http://trac.wordpress.org/ticket/10333">#10333</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (14659 => 14660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php 2010-05-15 06:49:16 UTC (rev 14659)
+++ trunk/wp-content/themes/twentyten/loop.php 2010-05-15 09:59:15 UTC (rev 14660)
</span><span class="lines">@@ -112,13 +112,12 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <span class="cat-links">
- <span class="entry-utility-prep entry-utility-prep-cat-links">
- <?php
- printf( __('Posted in %s', 'twentyten' ), '</span> '.get_the_category_list( ', ' ) );
- ?>
- </span>
- <span class="meta-sep">|</span>
</del><ins>+ <?php if ( count( get_the_category() ) ) : ?>
+ <span class="cat-links">
+ <span class="entry-utility-prep entry-utility-prep-cat-links"><?php printf( __('Posted in %s', 'twentyten' ), '</span> '.get_the_category_list( ', ' ) ); ?>
+ </span>
+ <span class="meta-sep">|</span>
+ <?php endif; ?>
</ins><span class="cx"> <?php
</span><span class="cx"> $tags_list = get_the_tag_list( '', ', ' );
</span><span class="cx"> if ( $tags_list ):
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (14659 => 14660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-05-15 06:49:16 UTC (rev 14659)
+++ trunk/wp-includes/category-template.php 2010-05-15 09:59:15 UTC (rev 14660)
</span><span class="lines">@@ -175,6 +175,9 @@
</span><span class="cx"> function get_the_category_list( $separator = '', $parents='', $post_id = false ) {
</span><span class="cx"> global $wp_rewrite;
</span><span class="cx"> $categories = get_the_category( $post_id );
</span><ins>+ if ( !is_object_in_taxonomy( get_post_type( $post_id ), 'category' ) )
+ return apply_filters( 'the_category', '', $separator, $parents );
+
</ins><span class="cx"> if ( empty( $categories ) )
</span><span class="cx"> return apply_filters( 'the_category', __( 'Uncategorized' ), $separator, $parents );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>