Ticket #35658: 35658.33.diff

src/wp-includes/functions.php

@@ -5356 +5356 @@
         // Strip timezone information
         return preg_replace( '/(?:Z|[+-]\d{2}(?::\d{2})?)$/', '', $formatted );
 }
+
+/**
+ * Check if an object type exists. By default, these are `post`, `comment`, `user`, and `term`.
+ *
+ * @param  string $object_type Object type to check.
+ * @return bool                True if the object type exists, false if not.
+ */
+function wp_object_type_exists( $object_type ) {
+        /**
+         * Filters WordPress object types.
+         *
+         * @since 4.6.0
+         *
+         * @param array  $types Array of object types.
+         */
+        $types = apply_filters( 'wp_object_types', array( 'post', 'comment', 'user', 'term' ) );
+
+        if ( in_array( $object_type, $types ) ) {
+                return true;
+        }
+
+        return false;
+}

src/wp-includes/meta.php

@@ -1015 +1015 @@
                 $wp_meta_keys = array();
         }
 
-        /* translators: object type name */
-        if ( ! in_array( $object_type, array( 'post', 'comment', 'user', 'term' ) ) ) {
-                _doing_it_wrong( __FUNCTION__, sprintf( __( 'Invalid object type: %s.' ), $object_type ), '4.6.0' );
+        if ( ! wp_object_type_exists( $object_type ) ) {
+                return new WP_Error( 'register_meta_failed', __( 'Meta can only be registered against a core object type.' ) );
         }
 
         $defaults = array(
@@ -1063 +1062 @@
 
         // Object subtype is required if using the args style of registration
         if ( ! $has_old_sanitize_cb && empty( $args['object_subtype'] ) ) {
-                return false;
+                return new WP_Error( 'register_meta_failed', __( 'Meta must be registered against an object subtype.' ) );
         }
 
         // If `auth_callback` is not provided, fall back to `is_protected_meta()`.
@@ -1097 +1096 @@
                 return true;
         }
 
-        return false;
+        return new WP_Error( 'register_meta_failed', __( 'Sanitize and auth callbacks registered; meta key not registered.' ) );
 }
 
 /**
@@ -1119 +1118 @@
         }
 
         // Only specific core object types are supported.
-        if ( ! in_array( $object_type, array( 'post', 'comment', 'user', 'term' ) ) ) {
-                return false;
+        if ( ! wp_object_type_exists( $object_type ) ) {
+                return new WP_Error( 'invalid_meta_key', __( 'Invalid meta key. Not a core object type.' ) );
         }
 
         if ( ! isset( $wp_meta_keys[ $object_type ] ) ) {
@@ -1218 +1217 @@
                 return new WP_Error( 'invalid_meta_key', __( 'Invalid meta key. Not registered.' ) );
         }
 
-        if ( ! in_array( $object_type, array( 'post', 'comment', 'user', 'term' ) ) ) {
+        if ( ! wp_object_type_exists( $object_type ) ) {
                 return new WP_Error( 'invalid_meta_key', __( 'Invalid meta key. Not a core object type.' ) );
         }