X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7688c6ba71852cd89123b62b2d57683535e4702a..4f4e083f6f77639c41e2b1ddb200de8e34301cee:/wp-admin/includes/taxonomy.php

diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php
index 3f70f45b..5f104d63 100644
--- a/wp-admin/includes/taxonomy.php
+++ b/wp-admin/includes/taxonomy.php
@@ -1,28 +1,68 @@
 <?php
+/**
+ * WordPress Taxonomy Administration API.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
 
 //
 // Category
 //
 
-function category_exists($cat_name) {
-	$id = is_term($cat_name, 'category');
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $cat_name
+ * @return unknown
+ */
+function category_exists($cat_name, $parent = 0) {
+	$id = is_term($cat_name, 'category', $parent);
 	if ( is_array($id) )
 		$id = $id['term_id'];
 	return $id;
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $id
+ * @return unknown
+ */
 function get_category_to_edit( $id ) {
 	$category = get_category( $id, OBJECT, 'edit' );
 	return $category;
 }
 
-function wp_create_category($cat_name) {
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @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) )
 		return $id;
 
-	return wp_insert_category( array('cat_name' => $cat_name) );
+	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $categories
+ * @param unknown_type $post_id
+ * @return unknown
+ */
 function wp_create_categories($categories, $post_id = '') {
 	$cat_ids = array ();
 	foreach ($categories as $category) {
@@ -39,9 +79,15 @@ function wp_create_categories($categories, $post_id = '') {
 	return $cat_ids;
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $cat_ID
+ * @return unknown
+ */
 function wp_delete_category($cat_ID) {
-	global $wpdb;
-
 	$cat_ID = (int) $cat_ID;
 	$default = get_option('default_category');
 
@@ -49,16 +95,29 @@ function wp_delete_category($cat_ID) {
 	if ( $cat_ID == $default )
 		return 0;
 
-	return wp_delete_term($cat_ID, 'category', "default=$default");
+	return wp_delete_term($cat_ID, 'category', array('default' => $default));
 }
 
-function wp_insert_category($catarr) {
-	global $wpdb;
-
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $catarr
+ * @param unknown_type $wp_error
+ * @return unknown
+ */
+function wp_insert_category($catarr, $wp_error = false) {
+	$cat_defaults = array('cat_ID' => 0, 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
+	$catarr = wp_parse_args($catarr, $cat_defaults);
 	extract($catarr, EXTR_SKIP);
 
-	if ( trim( $cat_name ) == '' )
-		return 0;
+	if ( trim( $cat_name ) == '' ) {
+		if ( ! $wp_error )
+			return 0;
+		else
+			return new WP_Error( 'cat_name', __('You did not enter a category name.') );
+	}
 
 	$cat_ID = (int) $cat_ID;
 
@@ -74,6 +133,9 @@ function wp_insert_category($catarr) {
 	$parent = $category_parent;
 
 	$parent = (int) $parent;
+	if ( $parent < 0 )
+		$parent = 0;
+
 	if ( empty($parent) || !category_exists( $parent ) || ($cat_ID && cat_is_ancestor_of($cat_ID, $parent) ) )
 		$parent = 0;
 
@@ -84,18 +146,28 @@ function wp_insert_category($catarr) {
 	else
 		$cat_ID = wp_insert_term($cat_name, 'category', $args);
 
-	if ( is_wp_error($cat_ID) )
-		return 0;
+	if ( is_wp_error($cat_ID) ) {
+		if ( $wp_error )
+			return $cat_ID;
+		else
+			return 0;
+	}
 
 	return $cat_ID['term_id'];
 }
 
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $catarr
+ * @return unknown
+ */
 function wp_update_category($catarr) {
-	global $wpdb;
-
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( $cat_ID == $catarr['category_parent'] )
+	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
 		return false;
 
 	// First, get all of the original fields
@@ -114,35 +186,83 @@ function wp_update_category($catarr) {
 // Tags
 //
 
-function get_tags_to_edit( $post_id ) {
-	global $wpdb;
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param unknown_type $post_id
+ * @return unknown
+ */
+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 = join( ',', $tag_names );
+	$tags_to_edit = esc_attr( $tags_to_edit );
+	$tags_to_edit = apply_filters( 'terms_to_edit', $tags_to_edit, $taxonomy );
+
 	return $tags_to_edit;
 }
 
+/**
+ * {@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) {
-	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 = is_term($tag_name, $taxonomy) )
 		return $id;
 
-	return wp_insert_term($tag_name, 'post_tag');
+	return wp_insert_term($tag_name, $taxonomy);
 }
-
-?>
\ No newline at end of file