<!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>[16331] trunk/wp-includes: Don't use deprecated category properties.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16331">16331</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-12 18:40:51 +0000 (Fri, 12 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use deprecated category properties. Props filosofo. Fixes <a href="http://trac.wordpress.org/ticket/15408">#15408</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (16330 => 16331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-11-12 16:57:47 UTC (rev 16330)
+++ trunk/wp-includes/category-template.php 2010-11-12 18:40:51 UTC (rev 16331)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> if ( $nicename )
</span><span class="cx"> $name = $parent->slug;
</span><span class="cx"> else
</span><del>- $name = $parent->cat_name;
</del><ins>+ $name = $parent->name;
</ins><span class="cx">
</span><span class="cx"> if ( $parent->parent && ( $parent->parent != $parent->term_id ) && !in_array( $parent->parent, $visited ) ) {
</span><span class="cx"> $visited[] = $parent->parent;
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $link )
</span><del>- $chain .= '<a href="' . get_category_link( $parent->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $parent->cat_name ) ) . '">'.$name.'</a>' . $separator;
</del><ins>+ $chain .= '<a href="' . get_category_link( $parent->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $parent->name ) ) . '">'.$name.'</a>' . $separator;
</ins><span class="cx"> else
</span><span class="cx"> $chain .= $name.$separator;
</span><span class="cx"> return $chain;
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case '':
</span><span class="cx"> default:
</span><del>- $thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->cat_name.'</a></li>';
</del><ins>+ $thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $thelist .= '</ul>';
</span><span class="lines">@@ -196,13 +196,13 @@
</span><span class="cx"> case 'multiple':
</span><span class="cx"> if ( $category->parent )
</span><span class="cx"> $thelist .= get_category_parents( $category->parent, true, $separator );
</span><del>- $thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->cat_name.'</a>';
</del><ins>+ $thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a>';
</ins><span class="cx"> break;
</span><span class="cx"> case 'single':
</span><span class="cx"> $thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>';
</span><span class="cx"> if ( $category->parent )
</span><span class="cx"> $thelist .= get_category_parents( $category->parent, false, $separator );
</span><del>- $thelist .= "$category->cat_name</a>";
</del><ins>+ $thelist .= "$category->name</a>";
</ins><span class="cx"> break;
</span><span class="cx"> case '':
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (16330 => 16331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2010-11-12 16:57:47 UTC (rev 16330)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2010-11-12 18:40:51 UTC (rev 16331)
</span><span class="lines">@@ -946,8 +946,8 @@
</span><span class="cx"> $args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category);
</span><span class="cx"> foreach ( (array) get_categories($args) as $cat ) {
</span><span class="cx"> $category_suggestions[] = array(
</span><del>- "category_id" => $cat->cat_ID,
- "category_name" => $cat->cat_name
</del><ins>+ "category_id" => $cat->term_id,
+ "category_name" => $cat->name
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3409,4 +3409,4 @@
</span><span class="cx"> return $pingbacks;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (16330 => 16331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-11-12 16:57:47 UTC (rev 16330)
+++ trunk/wp-includes/post-template.php 2010-11-12 18:40:51 UTC (rev 16331)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> foreach ( (array) get_the_category($post->ID) as $cat ) {
</span><span class="cx"> if ( empty($cat->slug ) )
</span><span class="cx"> continue;
</span><del>- $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->cat_ID);
</del><ins>+ $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->term_id);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>