Changeset 5818 for trunk/wp-includes/category.php

Timestamp:

07/25/2007 03:04:46 AM (17 years ago)

Author:

ryan

Message:

In your cats, making them back compat.

File:

• trunk/wp-includes/category.php (modified) (4 diffs)

trunk/wp-includes/category.php

@@ -19 +19 @@
     if ( 'link' == $args['type'] )
         $taxonomy = 'link_category';
-    return get_terms($taxonomy, $args);
+    $categories = get_terms($taxonomy, $args);
+
+    foreach ( $categories as $category )
+        _make_cat_compat($category);
+
+    return $categories;
 }
 
@@ -25 +30 @@
 // Handles category caching.
 function &get_category(&$category, $output = OBJECT) {
-    return get_term($category, 'category', $output);
+    $category = get_term($category, 'category', $output);
+
+    _make_cat_compat($category);
+
+    return $category;
 }
 
@@ -65 +74 @@
 
 function get_category_by_slug( $slug  ) {
-    return get_term_by('slug', $slug, 'category');
+    $category = get_term_by('slug', $slug, 'category');
+    if ( $category )
+        _make_cat_compat($category);
+
+    return $category;
 }
 
@@ -140 +153 @@
 }
 
+//
+// Private helpers
+//
+
+function _make_cat_compat( &$category) {
+    if ( is_object($category) ) {
+        $category->cat_ID = &$category->term_id;
+        $category->category_count = &$category->count;
+        $category->category_description = &$category->description;
+        $category->cat_name = &$category->name;
+        $category->category_nicename = &$category->slug;
+        $category->category_parent = &$category->parent;
+    } else if ( is_array($category) && isset($category['term_id']) ) {
+        $category['cat_ID'] = &$category['term_id'];
+        $category['category_count'] = &$category['count'];
+        $category['category_description'] = &$category['description'];
+        $category['cat_name'] = &$category['name'];
+        $category['category_nicename'] = &$category['slug'];
+        $category['category_parent'] = &$category['parent'];
+    }
+}
+
 ?>