Changeset 52042 for trunk/src/wp-includes/blocks/post-terms.php

Timestamp:

11/08/2021 02:26:27 PM (3 years ago)

Author:

youknowriad

Message:

Block Editor: Update the WordPress Packages based on Gutenberg 11.9 RC1.

This brings the JS packages up to date and is the first step that will allow us
to include the other block editor updates for WordPress 5.9:
FSE infrastrucutre, site editor and global styles.

Props noisysocks.
See #54337.

File:

• trunk/src/wp-includes/blocks/post-terms.php (modified) (1 diff)

trunk/src/wp-includes/blocks/post-terms.php

@@ -24 +24 @@
 
     $post_terms = get_the_terms( $block->context['postId'], $attributes['term'] );
-    if ( is_wp_error( $post_terms ) ) {
-        return '';
-    }
-    if ( empty( $post_terms ) ) {
+    if ( is_wp_error( $post_terms ) || empty( $post_terms ) ) {
         return '';
     }
 
-    $align_class_name = empty( $attributes['textAlign'] ) ? '' : ' ' . "has-text-align-{$attributes['textAlign']}";
+    $classes = 'taxonomy-' . $attributes['term'];
+    if ( isset( $attributes['textAlign'] ) ) {
+        $classes .= ' has-text-align-' . $attributes['textAlign'];
+    }
 
-    $terms_links = '';
-    foreach ( $post_terms as $term ) {
-        $terms_links .= sprintf(
-            '<a href="%1$s">%2$s</a> | ',
-            get_term_link( $term->term_id ),
-            esc_html( $term->name )
-        );
-    }
-    $terms_links        = trim( $terms_links, ' | ' );
-    $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+    $separator = empty( $attributes['separator'] ) ? ' ' : $attributes['separator'];
 
-    return sprintf(
-        '<div %1$s>%2$s</div>',
-        $wrapper_attributes,
-        $terms_links
+    $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+
+    return get_the_term_list(
+        $block->context['postId'],
+        $attributes['term'],
+        "<div $wrapper_attributes>",
+        '<span class="wp-block-post-terms__separator">' . $separator . '</span>',
+        '</div>'
     );
 }