--- a/web/wp-admin/includes/taxonomy.php	Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/includes/taxonomy.php	Mon Nov 19 18:26:13 2012 +0100
@@ -13,13 +13,13 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @param unknown_type $cat_name
  * @return unknown
  */
 function category_exists($cat_name, $parent = 0) {
-	$id = is_term($cat_name, 'category', $parent);
+	$id = term_exists($cat_name, 'category', $parent);
 	if ( is_array($id) )
 		$id = $id['term_id'];
 	return $id;
@@ -28,7 +28,7 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @param unknown_type $id
  * @return unknown
@@ -41,14 +41,14 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @param unknown_type $cat_name
  * @param unknown_type $parent
  * @return unknown
  */
 function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name) )
+	if ( $id = category_exists($cat_name, $parent) )
 		return $id;
 
 	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
@@ -57,7 +57,7 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  *
  * @param unknown_type $categories
  * @param unknown_type $post_id
@@ -73,42 +73,23 @@
 				$cat_ids[] = $id;
 	}
 
-	if ($post_id)
+	if ( $post_id )
 		wp_set_post_categories($post_id, $cat_ids);
 
 	return $cat_ids;
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Updates an existing Category or creates a new Category.
  *
- * @since unknown
+ * @since 2.0.0
  *
- * @param unknown_type $cat_ID
- * @return unknown
- */
-function wp_delete_category($cat_ID) {
-	$cat_ID = (int) $cat_ID;
-	$default = get_option('default_category');
-
-	// Don't delete the default cat
-	if ( $cat_ID == $default )
-		return 0;
-
-	return wp_delete_term($cat_ID, 'category', array('default' => $default));
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $catarr
- * @param unknown_type $wp_error
- * @return unknown
+ * @param mixed $catarr See defaults below. Set 'cat_ID' to a non-zero value to update an existing category. The 'taxonomy' key was added in 3.0.0.
+ * @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values.
+ * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure, depending on param $wp_error.
  */
 function wp_insert_category($catarr, $wp_error = false) {
-	$cat_defaults = array('cat_ID' => 0, 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
+	$cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
 	$catarr = wp_parse_args($catarr, $cat_defaults);
 	extract($catarr, EXTR_SKIP);
 
@@ -136,15 +117,15 @@
 	if ( $parent < 0 )
 		$parent = 0;
 
-	if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
+	if ( empty( $parent ) || ! term_exists( $parent, $taxonomy ) || ( $cat_ID && term_is_ancestor_of( $cat_ID, $parent, $taxonomy ) ) )
 		$parent = 0;
 
 	$args = compact('name', 'slug', 'parent', 'description');
 
 	if ( $update )
-		$cat_ID = wp_update_term($cat_ID, 'category', $args);
+		$cat_ID = wp_update_term($cat_ID, $taxonomy, $args);
 	else
-		$cat_ID = wp_insert_term($cat_name, 'category', $args);
+		$cat_ID = wp_insert_term($cat_name, $taxonomy, $args);
 
 	if ( is_wp_error($cat_ID) ) {
 		if ( $wp_error )
@@ -157,12 +138,15 @@
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Aliases wp_insert_category() with minimal args.
+ *
+ * If you want to update only some fields of an existing category, call this
+ * function with only the new values set inside $catarr.
  *
- * @since unknown
+ * @since 2.0.0
  *
- * @param unknown_type $catarr
- * @return unknown
+ * @param array $catarr The 'cat_ID' value is required. All other keys are optional.
+ * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure.
  */
 function wp_update_category($catarr) {
 	$cat_ID = (int) $catarr['cat_ID'];
@@ -189,7 +173,31 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.3.0
+ *
+ * @param unknown_type $tag_name
+ * @return unknown
+ */
+function tag_exists($tag_name) {
+	return term_exists($tag_name, 'post_tag');
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.3.0
+ *
+ * @param unknown_type $tag_name
+ * @return unknown
+ */
+function wp_create_tag($tag_name) {
+	return wp_create_term( $tag_name, 'post_tag');
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.3.0
  *
  * @param unknown_type $post_id
  * @return unknown
@@ -201,7 +209,7 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.8.0
  *
  * @param unknown_type $post_id
  * @return unknown
@@ -231,37 +239,13 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
- *
- * @param unknown_type $tag_name
- * @return unknown
- */
-function tag_exists($tag_name) {
-	return is_term($tag_name, 'post_tag');
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $tag_name
- * @return unknown
- */
-function wp_create_tag($tag_name) {
-	return wp_create_term( $tag_name, 'post_tag');
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
+ * @since 2.8.0
  *
  * @param unknown_type $tag_name
  * @return unknown
  */
 function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = is_term($tag_name, $taxonomy) )
+	if ( $id = term_exists($tag_name, $taxonomy) )
 		return $id;
 
 	return wp_insert_term($tag_name, $taxonomy);