| @@ -54,13 +54,9 @@ | ||
| 54 | 54 | if ( $attributes['displayAuthor'] ) { |
| 55 | 55 | $author = $item->get_author(); |
| 56 | 56 | if ( is_object( $author ) ) { |
| 57 | 57 | $author = $author->get_name(); |
| 58 | - $author = '<span class="wp-block-rss__item-author">' . sprintf( | |
| 59 | - /* translators: %s: the author. */ | |
| 60 | - __( 'by %s' ), | |
| 61 | - esc_html( strip_tags( $author ) ) | |
| 62 | - ) . '</span>'; | |
| 58 | + $author = '<span class="wp-block-rss__item-author">' . __( 'by' ) . ' ' . esc_html( strip_tags( $author ) ) . '</span>'; | |
| 63 | 59 | } |
| 64 | 60 | } |
| 65 | 61 | |
| 66 | 62 | $excerpt = ''; |
| @@ -78,19 +74,26 @@ | ||
| 78 | 74 | |
| 79 | 75 | $list_items .= "<li class='wp-block-rss__item'>{$title}{$date}{$author}{$excerpt}</li>"; |
| 80 | 76 | } |
| 81 | 77 | |
| 82 | - $classnames = array(); | |
| 78 | + $class = 'wp-block-rss'; | |
| 79 | + if ( isset( $attributes['align'] ) ) { | |
| 80 | + $class .= ' align' . $attributes['align']; | |
| 81 | + } | |
| 82 | + | |
| 83 | 83 | if ( isset( $attributes['blockLayout'] ) && 'grid' === $attributes['blockLayout'] ) { |
| 84 | - $classnames[] = 'is-grid'; | |
| 84 | + $class .= ' is-grid'; | |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | if ( isset( $attributes['columns'] ) && 'grid' === $attributes['blockLayout'] ) { |
| 88 | - $classnames[] = 'columns-' . $attributes['columns']; | |
| 88 | + $class .= ' columns-' . $attributes['columns']; | |
| 89 | 89 | } |
| 90 | - $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classnames ) ) ); | |
| 91 | 90 | |
| 92 | - return sprintf( '<ul %s>%s</ul>', $wrapper_attributes, $list_items ); | |
| 91 | + if ( isset( $attributes['className'] ) ) { | |
| 92 | + $class .= ' ' . $attributes['className']; | |
| 93 | + } | |
| 94 | + | |
| 95 | + return sprintf( '<ul class="%s">%s</ul>', esc_attr( $class ), $list_items ); | |
| 93 | 96 | } |
| 94 | 97 | |
| 95 | 98 | /** |
| 96 | 99 | * Registers the `core/rss` block on server. |
