Changeset 16331

Timestamp:

11/12/2010 06:40:51 PM (14 years ago)

Author:

scribu

Message:

Don't use deprecated category properties. Props filosofo. Fixes #15408

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (5 diffs)
• class-wp-xmlrpc-server.php (modified) (1 diff)
• post-template.php (modified) (1 diff)

trunk/wp-includes/category-template.php

@@ -41 +41 @@
         $name = $parent->slug;
     else
-        $name = $parent->cat_name;
+        $name = $parent->name;
 
     if ( $parent->parent && ( $parent->parent != $parent->term_id ) && !in_array( $parent->parent, $visited ) ) {
@@ -49 +49 @@
 
     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;
@@ -184 +184 @@
                 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>';
             }
         }
@@ -197 +197 @@
                     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':
@@ -203 +203 @@
                     if ( $category->parent )
                         $thelist .= get_category_parents( $category->parent, false, $separator );
-                    $thelist .= "$category->cat_name</a>";
+                    $thelist .= "$category->name</a>";
                     break;
                 case '':

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

@@ -947 +947 @@
         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
             );
         }

trunk/wp-includes/post-template.php

@@ -353 +353 @@
             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);
         }
     }