Changeset 38041 for trunk/src/wp-includes/meta.php

Timestamp:

07/13/2016 04:45:50 AM (9 years ago)

Author:

jeremyfelt

Message:

Meta: Ensure filters are backwards compatible for pre-4.6 style meta registration.

When using register_meta() with the function signature from 4.5 and earlier, the auth_{$type}_meta_{$key} and sanitize_{$type}_meta_{$key} filters are used. Any calls to register_meta() expecting this behavior should continue to work. The new filters, which take advantage of object subtypes, should not be added unless the proper $args array is passed.

See #35658.

File:

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

trunk/src/wp-includes/meta.php

@@ -1033 +1033 @@
     // There used to be individual args for sanitize and auth callbacks
     $has_old_sanitize_cb = false;
+    $has_old_auth_cb = false;
 
     if ( is_callable( $args ) ) {
@@ -1046 +1047 @@
     if ( is_callable( $deprecated ) ) {
         $args['auth_callback'] = $deprecated;
+        $has_old_auth_cb = true;
     }
 
@@ -1063 +1065 @@
 
     // Object subtype is required if using the args style of registration
-    if ( ! $has_old_sanitize_cb && empty( $args['object_subtype'] ) ) {
+    if ( ! $has_old_sanitize_cb && ! $has_old_auth_cb && empty( $args['object_subtype'] ) ) {
         return new WP_Error( 'register_meta_failed', __( 'Meta must be registered against an object subtype.' ) );
     }
@@ -1082 +1084 @@
     }
 
-    // Back-compat: old sanitize and auth callbacks applied to all of an object type
-    if ( $has_old_sanitize_cb ) {
+    // Back-compat: old sanitize and auth callbacks are applied to all of an object type.
+    if ( $has_old_sanitize_cb && is_callable( $args['sanitize_callback'] ) ) {
         add_filter( "sanitize_{$object_type}_meta_{$meta_key}", $args['sanitize_callback'], 10, 4 );
+    }
+
+    if ( $has_old_auth_cb && is_callable( $args['auth_callback'] ) ) {
         add_filter( "auth_{$object_type}_meta_{$meta_key}", $args['auth_callback'], 10, 6 );
-    } else {
+    }
+
+    if ( ! $has_old_auth_cb && ! $has_old_sanitize_cb) {
         if ( is_callable( $args['sanitize_callback'] ) ) {
             add_filter( "sanitize_{$object_type}_{$object_subtype}_meta_{$meta_key}", $args['sanitize_callback'], 10, 4 );