Changeset 48755 for branches/5.5

Timestamp:

08/07/2020 07:18:19 PM (6 years ago)

Author:

whyisjake

Message:

Accessibility: Themes: Only unlink custom logo on the home page if the theme declares support for that.

To accommodate for the change, the custom-logo theme feature now accepts the unlink-homepage-logo parameter.

If and when the logo is linked on the home page, the link has the aria-current attribute for better accessibility.

Follow-up to [48039], [48283], see [48749].

This brings the changes to the 5.5 branch.

Props sabernhardt, audrasjb, johnstonphilip, demetris, SergeyBiryukov.
Fixes #37011.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-includes/general-template.php (modified) (3 diffs)
• src/wp-includes/theme.php (modified) (2 diffs)

branches/5.5/src/wp-includes/general-template.php

@@ -1022 +1022 @@
                 );
 
-                if ( is_front_page() ) {
+                $unlink_homepage_logo = (bool) get_theme_support( 'custom-logo', 'unlink-homepage-logo' );
+
+                if ( $unlink_homepage_logo && is_front_page() && ! is_paged() ) {
                         /*
                          * If on the home page, set the logo alt attribute to an empty string,
@@ -1056 +1058 @@
                 $image = wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr );
 
-                if ( is_front_page() ) {
+                if ( $unlink_homepage_logo && is_front_page() && ! is_paged() ) {
                         // If on the home page, don't link the logo to home.
                         $html = sprintf(
@@ -1063 +1065 @@
                         );
                 } else {
+                        $aria_current = is_front_page() && ! is_paged() ? ' aria-current="page"' : '';
+
                         $html = sprintf(
-                                '<a href="%1$s" class="custom-logo-link" rel="home">%2$s</a>',
+                                '<a href="%1$s" class="custom-logo-link" rel="home"%2$s>%3$s</a>',
                                 esc_url( home_url( '/' ) ),
+                                $aria_current,
                                 $image
                         );

branches/5.5/src/wp-includes/theme.php

@@ -2473 +2473 @@
  *              by adding it to the function signature.
  * @since 5.5.0 The `core-block-patterns` feature was added and is enabled by default.
+ * @since 5.5.0 The `custom-logo` feature now also accepts 'unlink-homepage-logo'.
  *
  * @global array $_wp_theme_features
@@ -2539 +2540 @@
                         }
                         $defaults = array(
-                                'width'       => null,
-                                'height'      => null,
-                                'flex-width'  => false,
-                                'flex-height' => false,
-                                'header-text' => '',
+                                'width'                => null,
+                                'height'               => null,
+                                'flex-width'           => false,
+                                'flex-height'          => false,
+                                'header-text'          => '',
+                                'unlink-homepage-logo' => false,
                         );
                         $args[0]  = wp_parse_args( array_intersect_key( $args[0], $defaults ), $defaults );