X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..6e54d1cc889fd70eca54701860d695634b28a075:/wp-admin/includes/taxonomy.php

diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php
index a6c753d4..b371ec24 100644
--- a/wp-admin/includes/taxonomy.php
+++ b/wp-admin/includes/taxonomy.php
@@ -18,8 +18,8 @@
  * @param unknown_type $cat_name
  * @return unknown
  */
-function category_exists($cat_name) {
-	$id = is_term($cat_name, 'category');
+function category_exists($cat_name, $parent = 0) {
+	$id = term_exists($cat_name, 'category', $parent);
 	if ( is_array($id) )
 		$id = $id['term_id'];
 	return $id;
@@ -48,7 +48,7 @@ function get_category_to_edit( $id ) {
  * @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) );
@@ -73,19 +73,19 @@ function wp_create_categories($categories, $post_id = '') {
 				$cat_ids[] = $id;
 	}
 
-	if ($post_id)
+	if ( $post_id )
 		wp_set_post_categories($post_id, $cat_ids);
 
 	return $cat_ids;
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Deletes one existing category.
  *
- * @since unknown
+ * @since 2.0.0
  *
- * @param unknown_type $cat_ID
- * @return unknown
+ * @param int $cat_ID
+ * @return mixed Returns true if completes delete action; false if term doesnt exist; Zero on attempted deletion of default Category; WP_Error object is also a possibility.
  */
 function wp_delete_category($cat_ID) {
 	$cat_ID = (int) $cat_ID;
@@ -99,16 +99,16 @@ function wp_delete_category($cat_ID) {
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Updates an existing Category or creates a new Category.
  *
- * @since unknown
+ * @since 2.0.0
  *
- * @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);
 
@@ -142,9 +142,9 @@ function wp_insert_category($catarr, $wp_error = false) {
 	$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 +157,15 @@ function wp_insert_category($catarr, $wp_error = false) {
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Aliases wp_insert_category() with minimal args.
  *
- * @since unknown
+ * If you want to update only some fields of an existing category, call this
+ * function with only the new values set inside $catarr.
  *
- * @param unknown_type $catarr
- * @return unknown
+ * @since 2.0.0
+ *
+ * @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'];
@@ -194,21 +197,37 @@ function wp_update_category($catarr) {
  * @param unknown_type $post_id
  * @return unknown
  */
-function get_tags_to_edit( $post_id ) {
+function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
+	return get_terms_to_edit( $post_id, $taxonomy);
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $post_id
+ * @return unknown
+ */
+function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
 	$post_id = (int) $post_id;
 	if ( !$post_id )
 		return false;
 
-	$tags = wp_get_post_tags($post_id);
+	$tags = wp_get_post_terms($post_id, $taxonomy, array());
 
 	if ( !$tags )
 		return false;
 
+	if ( is_wp_error($tags) )
+		return $tags;
+
 	foreach ( $tags as $tag )
 		$tag_names[] = $tag->name;
 	$tags_to_edit = join( ',', $tag_names );
-	$tags_to_edit = attribute_escape( $tags_to_edit );
-	$tags_to_edit = apply_filters( 'tags_to_edit', $tags_to_edit );
+	$tags_to_edit = esc_attr( $tags_to_edit );
+	$tags_to_edit = apply_filters( 'terms_to_edit', $tags_to_edit, $taxonomy );
+
 	return $tags_to_edit;
 }
 
@@ -221,7 +240,7 @@ function get_tags_to_edit( $post_id ) {
  * @return unknown
  */
 function tag_exists($tag_name) {
-	return is_term($tag_name, 'post_tag');
+	return term_exists($tag_name, 'post_tag');
 }
 
 /**
@@ -233,10 +252,20 @@ function tag_exists($tag_name) {
  * @return unknown
  */
 function wp_create_tag($tag_name) {
-	if ( $id = tag_exists($tag_name) )
+	return wp_create_term( $tag_name, 'post_tag');
+}
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $tag_name
+ * @return unknown
+ */
+function wp_create_term($tag_name, $taxonomy = 'post_tag') {
+	if ( $id = term_exists($tag_name, $taxonomy) )
 		return $id;
 
-	return wp_insert_term($tag_name, 'post_tag');
+	return wp_insert_term($tag_name, $taxonomy);
 }
-
-?>