Ticket #25234: 25234.2.diff

src/wp-admin/includes/taxonomy.php

@@ -237 +237 @@
 
         return $tags_to_edit;
 }
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since 2.8.0
- *
- * @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, $taxonomy);
-}

src/wp-includes/taxonomy.php

@@ -2235 +2235 @@
 }
 
 /**
+ * Wrapper function that attempts to create a term by name in
+ *   the passed taxonomy.
+ *
+ * @since 2.8.0
+ *
+ * @param string $tag_name The name of the term.
+ * @return int|array If the term exists, returns the term_id. If not, returns
+ *    the result of wp_insert_term(), which
+ *    is array( 'term_id' => , 'term_taxonomy_id' => )
+ */
+function wp_create_term( $tag_name, $taxonomy = 'post_tag' ) {
+        if ( $id = term_exists( $tag_name, $taxonomy ) ) {
+                return $id;
+        }
+        return wp_insert_term( $tag_name, $taxonomy );
+}
+
+/**
  * Create Term and Taxonomy Relationships.
  *
  * Relates an object (post, link etc) to a term and taxonomy type. Creates the
@@ -3524 +3542 @@
 /**
  * Determine if a post's cache for the passed taxonomy
  *  is in sync.
- * 
+ *
  * @since 3.9.0
  *
  * @param int $id