Changeset 35653

Timestamp:

11/17/2015 04:11:21 AM (9 years ago)

Author:

rmccue

Message:

REST API: Optimise for singular error instances.

Previously, the API returned a list of errors, as WP_Error can hold multiple
error codes internally. This isn't a particularly common use case, and it
makes handling errors on the client side more complex than it needs to be.

Fixes #34551.

File:

• trunk/src/wp-includes/rest-api/class-wp-rest-server.php (modified) (2 diffs)

trunk/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -163 +163 @@
         }
 
-        $data = array();
+        $errors = array();
 
         foreach ( (array) $error->errors as $code => $messages ) {
             foreach ( (array) $messages as $message ) {
-                $data[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) );
-            }
+                $errors[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) );
+            }
+        }
+
+        $data = $errors[0];
+        if ( count( $errors ) > 1 ) {
+            // Remove the primary error.
+            array_shift( $errors );
+            $data['additional_errors'] = $errors;
         }
 
@@ -199 +206 @@
         $error = compact( 'code', 'message' );
 
-        return wp_json_encode( array( $error ) );
+        return wp_json_encode( $error );
     }