Changeset 37933

Timestamp:

06/30/2016 06:59:49 PM (10 years ago)

Author:

helen

Message:

Meta registration: Ensure $args is an array and simplify compat logic.

props ocean90, sc0ttkclark.
see #35658.

File:

• trunk/src/wp-includes/meta.php (modified) (4 diffs)

trunk/src/wp-includes/meta.php

@@ -981 +981 @@
          */
         return apply_filters( "sanitize_{$object_type}_meta_{$meta_key}", $meta_value, $meta_key, $object_type, $object_subtype );
-
-        
 }
 
@@ -1004 +1002 @@
  *     @type bool   $show_in_rest      Whether data associated with this meta key can be considered public.
  * }
- * @param string|array $auth_callback Deprecated. Use `$args` instead.
+ * @param string|array $deprecated Deprecated. Use `$args` instead.
  *
  * @return bool True if the meta key was successfully registered in the global array, false if not.
@@ -1010 +1008 @@
  *              callbacks, but will not add to the global registry as it requires a subtype.
  */
-function register_meta( $object_type, $meta_key, $args, $auth_callback = null ) {
+function register_meta( $object_type, $meta_key, $args, $deprecated = null ) {
         global $wp_meta_keys;
 
@@ -1031 +1029 @@
         );
 
-        $passed_args = array_slice( func_get_args(), 2 );
-
         // There used to be individual args for sanitize and auth callbacks
         $has_old_sanitize_cb = false;
 
-        if ( is_callable( $passed_args[0] ) ) {
-                $args['sanitize_callback'] = $passed_args[0];
+        if ( is_callable( $args ) ) {
+                $args = array(
+                        'sanitize_callback' => $args,
+                );
+
                 $has_old_sanitize_cb = true;
         } else {
-                $args = $passed_args[0];
-        }
-
-        if ( isset( $passed_args[1] ) && is_callable( $passed_args[1] ) ) {
-                $args['auth_callback'] = $passed_args[1];
+                $args = (array) $args;
+        }
+
+        if ( is_callable( $deprecated ) ) {
+                $args['auth_callback'] = $deprecated;
         }