Ticket #15408: dont-use-deprecated-cat-properties.15408.diff

wp-includes/post-template.php

@@ -352 +352 @@
                 foreach ( (array) get_the_category($post->ID) as $cat ) {
                         if ( empty($cat->slug ) )
                                 continue;
-                        $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->cat_ID);
+                        $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->term_id);
                 }
         }
 

wp-includes/class-wp-xmlrpc-server.php

@@ -946 +946 @@
                 $args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category);
                 foreach ( (array) get_categories($args) as $cat ) {
                         $category_suggestions[] = array(
-                                "category_id"   => $cat->cat_ID,
-                                "category_name" => $cat->cat_name
+                                "category_id"   => $cat->term_id,
+                                "category_name" => $cat->name
                         );
                 }
 
@@ -3409 +3409 @@
                 return $pingbacks;
         }
 }
-?>
- No newline at end of file
+?>

wp-includes/category-template.php

@@ -40 +40 @@
         if ( $nicename )
                 $name = $parent->slug;
         else
-                $name = $parent->cat_name;
+                $name = $parent->name;
 
         if ( $parent->parent && ( $parent->parent != $parent->term_id ) && !in_array( $parent->parent, $visited ) ) {
                 $visited[] = $parent->parent;
@@ -48 +48 @@
         }
 
         if ( $link )
-                $chain .= '<a href="' . get_category_link( $parent->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $parent->cat_name ) ) . '">'.$name.'</a>' . $separator;
+                $chain .= '<a href="' . get_category_link( $parent->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $parent->name ) ) . '">'.$name.'</a>' . $separator;
         else
                 $chain .= $name.$separator;
         return $chain;
@@ -183 +183 @@
                                         break;
                                 case '':
                                 default:
-                                        $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>';
+                                        $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>';
                         }
                 }
                 $thelist .= '</ul>';
@@ -196 +196 @@
                                 case 'multiple':
                                         if ( $category->parent )
                                                 $thelist .= get_category_parents( $category->parent, true, $separator );
-                                        $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>';
+                                        $thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>' . $category->name.'</a>';
                                         break;
                                 case 'single':
                                         $thelist .= '<a href="' . get_category_link( $category->term_id ) . '" title="' . esc_attr( sprintf( __( "View all posts in %s" ), $category->name ) ) . '" ' . $rel . '>';
                                         if ( $category->parent )
                                                 $thelist .= get_category_parents( $category->parent, false, $separator );
-                                        $thelist .= "$category->cat_name</a>";
+                                        $thelist .= "$category->name</a>";
                                         break;
                                 case '':
                                 default: