Changeset 5530 for trunk/wp-includes/classes.php

Timestamp:

05/23/2007 06:59:12 PM (19 years ago)

Author:

ryan

Message:

Convert category queries and list cats to taxonomy. see #4189

File:

• trunk/wp-includes/classes.php (modified) (6 diffs)

trunk/wp-includes/classes.php

@@ -558 +558 @@
 class Walker_Category extends Walker {
         var $tree_type = 'category';
-        var $db_fields = array ('parent' => 'category_parent', 'id' => 'cat_ID'); //TODO: decouple this
+        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
 
         function start_lvl($output, $depth, $args) {
@@ -581 +581 @@
                 extract($args);
 
-                $cat_name = attribute_escape( $category->cat_name);
+                $cat_name = attribute_escape( $category->name);
                 $cat_name = apply_filters( 'list_cats', $cat_name, $category );
-                $link = '<a href="' . get_category_link( $category->cat_ID ) . '" ';
-                if ( $use_desc_for_title == 0 || empty($category->category_description) )
+                $link = '<a href="' . get_category_link( $category->term_id ) . '" ';
+                if ( $use_desc_for_title == 0 || empty($category->description) )
                         $link .= 'title="' . sprintf(__( 'View all posts filed under %s' ), $cat_name) . '"';
                 else
-                        $link .= 'title="' . attribute_escape( apply_filters( 'category_description', $category->category_description, $category )) . '"';
+                        $link .= 'title="' . attribute_escape( apply_filters( 'category_description', $category->description, $category )) . '"';
                 $link .= '>';
                 $link .= $cat_name . '</a>';
@@ -597 +597 @@
                                 $link .= '(';
 
-                        $link .= '<a href="' . get_category_rss_link( 0, $category->cat_ID, $category->category_nicename ) . '"';
+                        $link .= '<a href="' . get_category_rss_link( 0, $category->term_id, $category->slug ) . '"';
 
                         if ( empty($feed) )
@@ -620 +620 @@
 
                 if ( isset($show_count) && $show_count )
-                        $link .= ' (' . intval($category->category_count) . ')';
+                        $link .= ' (' . intval($category->count) . ')';
 
                 if ( isset($show_date) && $show_date ) {
@@ -631 +631 @@
                 if ( 'list' == $args['style'] ) {
                         $output .= "\t<li";
-                        if ( $current_category && ($category->cat_ID == $current_category) )
+                        if ( $current_category && ($category->term_id == $current_category) )
                                 $output .=  ' class="current-cat"';
-                        elseif ( $_current_category && ($category->cat_ID == $_current_category->category_parent) )
+                        elseif ( $_current_category && ($category->term_id == $_current_category->parent) )
                                 $output .=  ' class="current-cat-parent"';
                         $output .= ">$link\n";
@@ -655 +655 @@
 class Walker_CategoryDropdown extends Walker {
         var $tree_type = 'category';
-        var $db_fields = array ('parent' => 'category_parent', 'id' => 'cat_ID'); //TODO: decouple this
+        var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
 
         function start_el($output, $category, $depth, $args) {
                 $pad = str_repeat('&nbsp;', $depth * 3);
 
-                $cat_name = apply_filters('list_cats', $category->cat_name, $category);
-                $output .= "\t<option value=\"".$category->cat_ID."\"";
-                if ( $category->cat_ID == $args['selected'] )
+                $cat_name = apply_filters('list_cats', $category->name, $category);
+                $output .= "\t<option value=\"".$category->term_id."\"";
+                if ( $category->term_id == $args['selected'] )
                         $output .= ' selected="selected"';
                 $output .= '>';
                 $output .= $pad.$cat_name;
                 if ( $args['show_count'] )
-                        $output .= '&nbsp;&nbsp;('. $category->category_count .')';
+                        $output .= '&nbsp;&nbsp;('. $category->count .')';
                 if ( $args['show_last_update'] ) {
                         $format = 'Y-m-d';