Changeset 48505

Timestamp:

07/17/2020 03:14:00 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Options, Meta APIs: Reorder the parameters of default_{$meta_type}_metadata filter.

This brings consistency with the get_{$meta_type}_metadata filter and more closely matches the get_metadata_default() function signature.

Follow-up to [48502].

Props spacedmonkey.
See #43941.

File:

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

trunk/src/wp-includes/meta.php

@@ -545 +545 @@
          *
          * @since 3.1.0
+         * @since 5.5.0 Added the `$meta_type` parameter.
          *
          * @param mixed  $value     The value to return, either a single metadata value or an array
@@ -551 +552 @@
          * @param string $meta_key  Metadata key.
          * @param bool   $single    Whether to return only the first value of the specified `$meta_key`.
+         * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
+         *                          or any other object type with an associated meta table.
          */
-        $check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single );
+        $check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single, $meta_type );
         if ( null !== $check ) {
                 if ( $single && is_array( $check ) ) {
@@ -619 +622 @@
          * @param mixed  $value     The value to return, either a single metadata value or an array
          *                          of values depending on the value of `$single`.
+         * @param int    $object_id ID of the object metadata is for.
+         * @param string $meta_key  Metadata key.
+         * @param bool   $single    Whether to return only the first value of the specified `$meta_key`.
          * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
          *                          or any other object type with an associated meta table.
-         * @param string $meta_key  Metadata key.
-         * @param bool   $single    Whether to return only the first value of the specified `$meta_key`.
-         * @param int    $object_id ID of the object metadata is for.
          */
-        $value = apply_filters( "default_{$meta_type}_metadata", $value, $meta_type, $meta_key, $single, $object_id );
+        $value = apply_filters( "default_{$meta_type}_metadata", $value, $object_id, $meta_key, $single, $meta_type );
 
         if ( ! $single && ! wp_is_numeric_array( $value ) ) {
@@ -1380 +1383 @@
  *
  * @param mixed  $value     Current value passed to filter.
- * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
- *                          or any other object type with an associated meta table.
+ * @param int    $object_id ID of the object metadata is for.
  * @param string $meta_key  Metadata key.
  * @param bool   $single    If true, return only the first value of the specified meta_key.
  *                          This parameter has no effect if meta_key is not specified.
- * @param int    $object_id ID of the object metadata is for.
+ * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
+ *                          or any other object type with an associated meta table.
  * @return mixed Single metadata default, or array of defaults.
  */
-function filter_default_metadata( $value, $meta_type, $meta_key, $single, $object_id ) {
+function filter_default_metadata( $value, $object_id, $meta_key, $single, $meta_type ) {
         global $wp_meta_keys;