WordPress 3.8.1-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / taxonomy.php

diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php
index fdc6d64d554439de4a6da39d4a1ee1e0aeef7abf..87fe6e6d6738ba6a93e4f93d1d9b251b1ae363e6 100644 (file)
--- a/wp-admin/includes/taxonomy.php
+++ b/wp-admin/includes/taxonomy.php
@@ -34,7 +34,8 @@ function category_exists($cat_name, $parent = 0) {
  * @return unknown
  */
 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;
 }
 
@@ -155,7 +156,8 @@ function wp_update_category($catarr) {
                return false;
 
        // 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.
        $category = wp_slash($category);