Wizard 2.8.2-scripts

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

diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php
index a6c753d48b47e294b80e07f4a3b59311252e1b98..5f104d630feef124323f517289c14141d15753e8 100644 (file)
--- 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 = is_term($cat_name, 'category', $parent);
        if ( is_array($id) )
                $id = $id['term_id'];
        return $id;
@@ -194,21 +194,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;
 }
 
@@ -233,10 +249,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 = is_term($tag_name, $taxonomy) )
                return $id;
 
-       return wp_insert_term($tag_name, 'post_tag');
+       return wp_insert_term($tag_name, $taxonomy);
 }
-
-?>