Revert changes to the post_type_supports function

Author: t-hamano

src/wp-includes/post.php

@@ -2350,27 +2350,8 @@ function get_all_post_type_supports( $post_type ) {
 function post_type_supports( $post_type, $feature ) {
 	global $_wp_post_type_features;
 
-	if ( str_contains( $feature, '/' ) ) {
-		$parts       = explode( '/', $feature, 2 );
-		$feature     = $parts[0];
-		$sub_feature = $parts[1];
-
-		if ( ! isset( $_wp_post_type_features[ $post_type ][ $feature ] ) ) {
-			return false;
-		}
-
-		$feature_value = $_wp_post_type_features[ $post_type ][ $feature ];
-
-		if ( is_array( $feature_value ) && isset( $feature_value[0] ) && is_array( $feature_value[0] ) ) {
-			return ! empty( $feature_value[0][ $sub_feature ] );
-		}
-
-		return false;
-	}
-
 	return ( isset( $_wp_post_type_features[ $post_type ][ $feature ] ) );
 }
-
 /**
  * Retrieves a list of post type names that support a specific feature.
  *

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -130,7 +130,7 @@ public function get_items_permissions_check( $request ) {
 			foreach ( (array) $request['post'] as $post_id ) {
 				$post = get_post( $post_id );
 
-				if ( $post && $is_note && ! post_type_supports( $post->post_type, 'editor/notes' ) ) {
+				if ( $post && $is_note && ! $this->check_post_type_supports_notes( $post->post_type ) ) {
 					return new WP_Error(
 						'rest_comment_not_supported_post_type',
 						__( 'Sorry, this post type does not support notes.' ),
@@ -566,7 +566,7 @@ public function create_item_permissions_check( $request ) {
 			);
 		}
 
-		if ( $is_note && ! post_type_supports( $post->post_type, 'editor/notes' ) ) {
+		if ( $is_note && ! $this->check_post_type_supports_notes( $post->post_type ) ) {
 			return new WP_Error(
 				'rest_comment_not_supported_post_type',
 				__( 'Sorry, this post type does not support notes.' ),
@@ -1978,4 +1978,26 @@ protected function check_is_comment_content_allowed( $prepared_comment ) {
 		 */
 		return '' !== $check['comment_content'];
 	}
+
+	/**
+	 * Check if post type supports block comments.
+	 *
+	 * @param string $post_type Post type name.
+	 * @return bool True if post type supports block comments, false otherwise.
+	 */
+	private function check_post_type_supports_notes( $post_type ) {
+		$supports = get_all_post_type_supports( $post_type );
+		if ( ! isset( $supports['editor'] ) ) {
+			return false;
+		}
+		if ( ! is_array( $supports['editor'] ) ) {
+			return false;
+		}
+		foreach ( $supports['editor'] as $item ) {
+			if ( is_array( $item ) && isset( $item['notes'] ) && true === $item['notes'] ) {
+				return true;
+			}
+		}
+		return true;
+	}
 }