Changeset 25662

Timestamp:

10/02/2013 07:58:50 PM (11 years ago)

Author:

wonderboymusic

Message:

Rather than adding a taxonomy arg to get_category(), convert all uses of get_category() in core to get_term(). By doing so, we negate the need to call _make_cat_compat() in a few places that are only looking for a single property.

Fixes #8722.

Location:

trunk/src

Files:

• wp-admin/includes/taxonomy.php (modified) (2 diffs)
• wp-includes/category-template.php (modified) (2 diffs)
• wp-includes/category.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (1 diff)

trunk/src/wp-admin/includes/taxonomy.php

@@ -35 +35 @@
  */
 function get_category_to_edit( $id ) {
-    $category = get_category( $id, OBJECT, 'edit' );
+    $category = get_term( $id, 'category', OBJECT, 'edit' );
+    _make_cat_compat( $category );
     return $category;
 }
@@ -156 +157 @@
 
     // First, get all of the original fields
-    $category = get_category($cat_ID, ARRAY_A);
+    $category = get_term( $cat_ID, 'category', ARRAY_A );
+    _make_cat_compat( $category );
 
     // Escape data pulled from DB.

trunk/src/wp-includes/category-template.php

@@ -42 +42 @@
 function get_category_parents( $id, $link = false, $separator = '/', $nicename = false, $visited = array() ) {
     $chain = '';
-    $parent = get_category( $id );
+    $parent = get_term( $id, 'category' );
     if ( is_wp_error( $parent ) )
         return $parent;
@@ -136 +136 @@
 function get_the_category_by_ID( $cat_ID ) {
     $cat_ID = (int) $cat_ID;
-    $category = get_category( $cat_ID );
+    $category = get_term( $cat_ID, 'category' );
     if ( is_wp_error( $category ) )
         return $category;

trunk/src/wp-includes/category.php

@@ -134 +134 @@
         }
 
-        if ( $path == $full_path )
-            return get_category( $category->term_id, $output );
+        if ( $path == $full_path ) {
+            $category = get_term( $category->term_id, 'category', $output );
+            _make_cat_compat( $category );
+            return $category;
+        }
     }
 
     // If full matching is not required, return the first cat that matches the leaf.
-    if ( ! $full_match )
-        return get_category( $categories[0]->term_id, $output );
+    if ( ! $full_match ) {
+        $category = get_term( reset( $categories )->term_id, 'category', $output );
+        _make_cat_compat( $category );
+        return $category;
+    }
 
     return null;
@@ -186 +192 @@
 function get_cat_name( $cat_id ) {
     $cat_id = (int) $cat_id;
-    $category = get_category( $cat_id );
+    $category = get_term( $cat_id, 'category' );
     if ( ! $category || is_wp_error( $category ) )
         return '';

trunk/src/wp-includes/link-template.php

@@ -132 +132 @@
             // having to assign it explicitly
             if ( empty($category) ) {
-                $default_category = get_category( get_option( 'default_category' ) );
+                $default_category = get_term( get_option( 'default_category' ), 'category' );
                 $category = is_wp_error( $default_category ) ? '' : $default_category->slug;
             }