Changeset 39957 for branches/4.7/src/wp-includes/rest-api.php

Timestamp:

01/26/2017 01:46:54 PM (10 years ago)

Author:

ocean90

Message:

REST API: Unify object access handling for simplicity.

Rather than repeating ourselves, unifying the access into a single method keeps everything tidy. While we're at it, add in additional schema handling for common parameters.

Merge of [39954] to the 4.7 branch.

See #38792.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api.php (modified) (3 diffs)

branches/4.7/src/wp-includes/rest-api.php

@@ -47 +47 @@
         }
 
+        if ( isset( $args['args'] ) ) {
+                $common_args = $args['args'];
+                unset( $args['args'] );
+        } else {
+                $common_args = array();
+        }
+
         if ( isset( $args['callback'] ) ) {
                 // Upgrade a single set to multiple.
@@ -58 +65 @@
         );
         foreach ( $args as $key => &$arg_group ) {
-                if ( ! is_numeric( $arg_group ) ) {
+                if ( ! is_numeric( $key ) ) {
                         // Route option, skip here.
                         continue;
@@ -64 +71 @@
 
                 $arg_group = array_merge( $defaults, $arg_group );
+                $arg_group['args'] = array_merge( $common_args, $arg_group['args'] );
         }