X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..42aebe6945a3a60c8f73853bea2c8b202d64a20b:/wp-admin/includes/taxonomy.php

diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php
index 7423cf92..87fe6e6d 100644
--- 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,10 +156,11 @@ 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 = add_magic_quotes($category);
+	$category = wp_slash($category);
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$catarr = array_merge($category, $catarr);