Ticket #38323: 38323-improved-filter.diff

src/wp-includes/meta.php

@@ -1298 +1298 @@
 }
 
 /**
+ * /**
  * Returns the object subtype for a given object ID of a specific type.
  *
  * @since 5.0.0
@@ -1309 +1310 @@
 function get_object_subtype( $object_type, $object_id ) {
         $object_id      = (int) $object_id;
         $object_subtype = '';
-
+        $object = null;
         switch ( $object_type ) {
                 case 'post':
-                        $post_type = get_post_type( $object_id );
+                        $object = get_post( $object_id );
+                        if ( ! $object instanceof WP_Post ) {
+                                break;
+                        }
 
-                        if ( ! empty( $post_type ) ) {
-                                $object_subtype = $post_type;
-                        }
+                        $object_subtype = $object->post_type;
                         break;
 
                 case 'term':
-                        $term = get_term( $object_id );
-                        if ( ! $term instanceof WP_Term ) {
+                        $object = get_term( $object_id );
+                        if ( ! $object instanceof WP_Term ) {
                                 break;
                         }
 
-                        $object_subtype = $term->taxonomy;
+                        $object_subtype = $object->taxonomy;
                         break;
 
                 case 'comment':
-                        $comment = get_comment( $object_id );
-                        if ( ! $comment ) {
+                        $object = get_comment( $object_id );
+                        if ( ! $object ) {
                                 break;
                         }
 
@@ -1338 +1340 @@
                         break;
 
                 case 'user':
-                        $user = get_user_by( 'id', $object_id );
-                        if ( ! $user ) {
+                        $object = get_user_by( 'id', $object_id );
+                        if ( ! $object ) {
                                 break;
                         }
 
@@ -1357 +1359 @@
          *
          * @param string $object_subtype Empty string to override.
          * @param int    $object_id      ID of the object to get the subtype for.
+         * @param WP_Post|WP_Term|WP_Comment|WP_User|null $object The object to get the subtype for
          */
-        return apply_filters( "get_object_subtype_{$object_type}", $object_subtype, $object_id );
+        return apply_filters( "get_object_subtype_{$object_type}", $object_subtype, $object_id, $object );
 }