Changeset 43445 for branches/4.9/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

Timestamp:

07/13/2018 06:50:51 AM (7 years ago)

Author:

pento

Message:

REST API: Filter responses based on the _fields parameter, before data is processed.

Historically, the REST API would generate the entire response object, including running expensive filters, then it would apply the _fields parameter, discarding the fields that weren't specificed.

This change causes _fields to be applied earlier, so that only requested fields are processed.

Merges [43087] to the 4.9 branch.

Props danielbachhuber.
See #43874.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (modified) (1 diff)

branches/4.9/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php

@@ -838 +838 @@
 
         $data   = array();
-        $schema = $this->get_item_schema();
-
-        if ( ! empty( $schema['properties']['id'] ) ) {
+        $fields = $this->get_fields_for_response( $request );
+
+        if ( in_array( 'id', $fields, true ) ) {
             $data['id'] = $user->ID;
         }
 
-        if ( ! empty( $schema['properties']['username'] ) ) {
+        if ( in_array( 'username', $fields, true ) ) {
             $data['username'] = $user->user_login;
         }
 
-        if ( ! empty( $schema['properties']['name'] ) ) {
+        if ( in_array( 'name', $fields, true ) ) {
             $data['name'] = $user->display_name;
         }
 
-        if ( ! empty( $schema['properties']['first_name'] ) ) {
+        if ( in_array( 'first_name', $fields, true ) ) {
             $data['first_name'] = $user->first_name;
         }
 
-        if ( ! empty( $schema['properties']['last_name'] ) ) {
+        if ( in_array( 'last_name', $fields, true ) ) {
             $data['last_name'] = $user->last_name;
         }
 
-        if ( ! empty( $schema['properties']['email'] ) ) {
+        if ( in_array( 'email', $fields, true ) ) {
             $data['email'] = $user->user_email;
         }
 
-        if ( ! empty( $schema['properties']['url'] ) ) {
+        if ( in_array( 'url', $fields, true ) ) {
             $data['url'] = $user->user_url;
         }
 
-        if ( ! empty( $schema['properties']['description'] ) ) {
+        if ( in_array( 'description', $fields, true ) ) {
             $data['description'] = $user->description;
         }
 
-        if ( ! empty( $schema['properties']['link'] ) ) {
+        if ( in_array( 'link', $fields, true ) ) {
             $data['link'] = get_author_posts_url( $user->ID, $user->user_nicename );
         }
 
-        if ( ! empty( $schema['properties']['locale'] ) ) {
+        if ( in_array( 'locale', $fields, true ) ) {
             $data['locale'] = get_user_locale( $user );
         }
 
-        if ( ! empty( $schema['properties']['nickname'] ) ) {
+        if ( in_array( 'nickname', $fields, true ) ) {
             $data['nickname'] = $user->nickname;
         }
 
-        if ( ! empty( $schema['properties']['slug'] ) ) {
+        if ( in_array( 'slug', $fields, true ) ) {
             $data['slug'] = $user->user_nicename;
         }
 
-        if ( ! empty( $schema['properties']['roles'] ) ) {
+        if ( in_array( 'roles', $fields, true ) ) {
             // Defensively call array_values() to ensure an array is returned.
             $data['roles'] = array_values( $user->roles );
         }
 
-        if ( ! empty( $schema['properties']['registered_date'] ) ) {
+        if ( in_array( 'registered_date', $fields, true ) ) {
             $data['registered_date'] = date( 'c', strtotime( $user->user_registered ) );
         }
 
-        if ( ! empty( $schema['properties']['capabilities'] ) ) {
+        if ( in_array( 'capabilities', $fields, true ) ) {
             $data['capabilities'] = (object) $user->allcaps;
         }
 
-        if ( ! empty( $schema['properties']['extra_capabilities'] ) ) {
+        if ( in_array( 'extra_capabilities', $fields, true ) ) {
             $data['extra_capabilities'] = (object) $user->caps;
         }
 
-        if ( ! empty( $schema['properties']['avatar_urls'] ) ) {
+        if ( in_array( 'avatar_urls', $fields, true ) ) {
             $data['avatar_urls'] = rest_get_avatar_urls( $user->user_email );
         }
 
-        if ( ! empty( $schema['properties']['meta'] ) ) {
+        if ( in_array( 'meta', $fields, true ) ) {
             $data['meta'] = $this->meta->get_value( $user->ID, $request );
         }