Changeset 54257 for trunk/src/wp-includes/blocks/site-title.php

Timestamp:

09/20/2022 03:14:54 PM (2 years ago)

Author:

gziolo

Message:

Editor: Sync changes from the Gutenberg plugin 14.1 release

Updated WordPress packages necessary for releasing WordPress 6.1 Beta 1:

• @wordpress/a11y@3.17.1
  • @wordpress/annotations@2.17.2
  • @wordpress/api-fetch@6.14.1
  • @wordpress/autop@3.17.1
  • @wordpress/babel-plugin-import-jsx-pragma@4.0.1
  • @wordpress/babel-plugin-makepot@5.1.1
  • @wordpress/babel-preset-default@7.1.1
  • @wordpress/base-styles@4.8.1
  • @wordpress/blob@3.17.1
  • @wordpress/block-directory@3.15.2
  • @wordpress/block-editor@10.0.2
  • @wordpress/block-library@7.14.2
  • @wordpress/block-serialization-default-parser@4.17.1
  • @wordpress/block-serialization-spec-parser@4.17.1
  • @wordpress/blocks@11.16.2
  • @wordpress/browserslist-config@5.0.1
  • @wordpress/components@21.0.2
  • @wordpress/compose@5.15.2
  • @wordpress/core-data@5.0.2
  • @wordpress/create-block-tutorial-template@2.5.1
  • @wordpress/create-block@4.1.1
  • @wordpress/custom-templated-path-webpack-plugin@2.1.3
  • @wordpress/customize-widgets@3.14.2
  • @wordpress/data-controls@2.17.2
  • @wordpress/data@7.1.2
  • @wordpress/date@4.17.1
  • @wordpress/dependency-extraction-webpack-plugin@4.0.2
  • @wordpress/deprecated@3.17.1
  • @wordpress/docgen@1.26.1
  • @wordpress/dom-ready@3.17.1
  • @wordpress/dom@3.17.2
  • @wordpress/e2e-test-utils@8.1.1
  • @wordpress/e2e-tests@5.1.2
  • @wordpress/edit-post@6.14.2
  • @wordpress/edit-site@4.14.2
  • @wordpress/edit-widgets@4.14.2
  • @wordpress/editor@12.16.2
  • @wordpress/element@4.15.1
  • @wordpress/env@5.2.1
  • @wordpress/escape-html@2.17.1
  • @wordpress/eslint-plugin@13.1.1
  • @wordpress/format-library@3.15.2
  • @wordpress/hooks@3.17.1
  • @wordpress/html-entities@3.17.1
  • @wordpress/i18n@4.17.1
  • @wordpress/icons@9.8.1
  • @wordpress/interface@4.16.2
  • @wordpress/is-shallow-equal@4.17.1
  • @wordpress/jest-console@6.0.1
  • @wordpress/jest-preset-default@9.0.1
  • @wordpress/jest-puppeteer-axe@5.0.1
  • @wordpress/keyboard-shortcuts@3.15.2
  • @wordpress/keycodes@3.17.1
  • @wordpress/lazy-import@1.4.3
  • @wordpress/library-export-default-webpack-plugin@2.3.3
  • @wordpress/list-reusable-blocks@3.15.2
  • @wordpress/media-utils@4.8.1
  • @wordpress/notices@3.17.2
  • @wordpress/npm-package-json-lint-config@4.2.1
  • @wordpress/nux@5.15.2
  • @wordpress/plugins@4.15.2
  • @wordpress/postcss-plugins-preset@4.1.1
  • @wordpress/postcss-themes@5.0.1
  • @wordpress/preferences-persistence@1.9.1
  • @wordpress/preferences@2.9.2
  • @wordpress/prettier-config@2.0.1
  • @wordpress/primitives@3.15.1
  • @wordpress/priority-queue@2.17.2
  • @wordpress/project-management-automation@1.16.1
  • @wordpress/react-i18n@3.15.1
  • @wordpress/readable-js-assets-webpack-plugin@2.0.1
  • @wordpress/redux-routine@4.17.1
  • @wordpress/reusable-blocks@3.15.2
  • @wordpress/rich-text@5.15.2
  • @wordpress/scripts@24.1.2
  • @wordpress/server-side-render@3.15.2
  • @wordpress/shortcode@3.17.1
  • @wordpress/style-engine@1.0.1
  • @wordpress/stylelint-config@21.0.1
  • @wordpress/token-list@2.17.1
  • @wordpress/url@3.18.1
  • @wordpress/viewport@4.15.2
  • @wordpress/warning@2.17.1
  • @wordpress/widgets@2.15.2
  • @wordpress/wordcount@3.17.1

Props bernhard-reiter, cbravobernal, czapla, oandregal, isabel_brison, andrewserong, mciampini.
See #56467.

File:

• trunk/src/wp-includes/blocks/site-title.php (modified) (2 diffs)

trunk/src/wp-includes/blocks/site-title.php

@@ -22 +22 @@
     $align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
 
-    $aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : '';
-
     if ( isset( $attributes['level'] ) ) {
         $tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
@@ -29 +27 @@
 
     if ( $attributes['isLink'] ) {
-        $link_attrs = array(
-            'href="' . esc_url( get_bloginfo( 'url' ) ) . '"',
-            'rel="' . esc_attr( 'home' ) . '"',
+        $aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : '';
+        $link_target  = ! empty( $attributes['linkTarget'] ) ? $attributes['linkTarget'] : '_self';
+
+        $site_title = sprintf(
+            '<a href="%1$s" target="%2$s" rel="home"%3$s>%4$s</a>',
+            esc_url( home_url() ),
+            esc_attr( $link_target ),
             $aria_current,
+            esc_html( $site_title )
         );
-        if ( '_blank' === $attributes['linkTarget'] ) {
-            $link_attrs[] = 'target="_blank"';
-        }
-        $site_title = sprintf( '<a %1$s>%2$s</a>', implode( ' ', $link_attrs ), esc_html( $site_title ) );
     }
     $wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );