Ticket #16567: 16567.4.diff

src/wp-admin/includes/ajax-actions.php

@@ -449 +449 @@
         $popular_ids = wp_popular_terms_checklist($taxonomy->name, 0, 10, false);
 
         foreach ( $names as $cat_name ) {
-                $cat_name = trim($cat_name);
-                $category_nicename = sanitize_title($cat_name);
-                if ( '' === $category_nicename )
+                $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+                if ( is_wp_error( $cat_id ) && $cat_id->get_error_code() == 'term_exists' ) {
+                        $cat_id = $cat_id->get_error_data();
+                }
+
+                if ( is_wp_error( $cat_id ) || ! $cat_id ) {
                         continue;
-                if ( !$cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) )
-                        $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
-                if ( is_wp_error( $cat_id ) ) {
-                        continue;
-                } elseif ( is_array( $cat_id ) ) {
+                } else {
                         $cat_id = $cat_id['term_id'];
                 }
+
                 $checked_categories[] = $cat_id;
                 if ( $parent ) // Do these all at once in a second
                         continue;
@@ -774 +774 @@
  * @param string $action Action to perform.
  */
 function wp_ajax_add_link_category( $action ) {
-        if ( empty( $action ) )
+        if ( empty( $action ) ) 
                 $action = 'add-link-category';
         check_ajax_referer( $action );
         if ( !current_user_can( 'manage_categories' ) )
@@ -782 +782 @@
         $names = explode(',', wp_unslash( $_POST['newcat'] ) );
         $x = new WP_Ajax_Response();
         foreach ( $names as $cat_name ) {
-                $cat_name = trim($cat_name);
-                $slug = sanitize_title($cat_name);
-                if ( '' === $slug )
+                $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+                if ( is_wp_error( $cat_id ) && $cat_id->get_error_code() == 'term_exists' ) {
+                        $cat_id = $cat_id->get_error_data();
+                }
+
+                if ( is_wp_error( $cat_id ) || ! $cat_id ) {
                         continue;
-                if ( !$cat_id = term_exists( $cat_name, 'link_category' ) )
-                        $cat_id = wp_insert_term( $cat_name, 'link_category' );
-                if ( is_wp_error( $cat_id ) ) {
-                        continue;
-                } elseif ( is_array( $cat_id ) ) {
+                } else {
                         $cat_id = $cat_id['term_id'];
                 }
+
                 $cat_name = esc_html( $cat_name );
                 $x->add( array(
                         'what' => 'link-category',