Ticket #47018: 47018.4.diff

src/js/_enqueues/admin/tags.js

@@ -101 +101 @@
         $('#submit').on( 'click', function(){
                 var form = $(this).parents('form');
 
-                if ( ! validateForm( form ) )
-                        return false;
-
                 if ( addingTerm ) {
                         // If we're adding a term, noop the button to avoid duplicate requests.
                         return false;
@@ -127 +124 @@
 
                         $('#ajax-response').empty();
                         res = wpAjax.parseAjaxResponse( r, 'ajax-response' );
-                        if ( ! res || res.errors )
+
+                        if ( res.errors && res.responses[0].errors[0].code === 'empty_term_name' ) {
+                                validateForm( form );
+                        }
+
+                        if ( ! res || res.errors ) {
                                 return;
+                        }
 
                         parent = form.find( 'select#parent' ).val();
 

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

@@ -1071 +1071 @@
         }
 
         if ( ! $tag || is_wp_error( $tag ) ) {
-                $message = __( 'An error has occurred. Please reload the page and try again.' );
+                $message    = __( 'An error has occurred. Please reload the page and try again.' );
+                $error_code = 'error';
 
                 if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
                         $message = $tag->get_error_message();
                 }
 
+                if ( is_wp_error( $tag ) && $tag->get_error_code() ) {
+                        $error_code = $tag->get_error_code();
+                }
+
                 $x->add(
                         array(
                                 'what' => 'taxonomy',
-                                'data' => new WP_Error( 'error', $message ),
+                                'data' => new WP_Error( $error_code, $message ),
                         )
                 );
                 $x->send();