Ticket #37011: 37011.6.diff

src/wp-includes/general-template.php

@@ -1021 +1021 @@
                         'class' => 'custom-logo',
                 );
 
-                if ( is_front_page() ) {
+                $unlink_homepage_logo = get_theme_support( 'custom-logo', 'unlink-homepage-logo' ) ? true : false;
+
+                if ( is_front_page() && $unlink_homepage_logo ) {
                         /*
                          * If on the home page, set the logo alt attribute to an empty string,
                          * as the image is decorative and doesn't need its purpose to be described.
@@ -1055 +1057 @@
                  */
                 $image = wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr );
 
-                if ( is_front_page() ) {
+                if ( is_front_page() && $unlink_homepage_logo ) {
                         // If on the home page, don't link the logo to home.
                         $html = sprintf(
                                 '<span class="custom-logo-link">%1$s</span>',
@@ -1062 +1064 @@
                                 $image
                         );
                 } else {
+                        $aria_current = is_front_page() ? ' 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
                         );
                 }

src/wp-includes/theme.php

@@ -2472 +2472 @@
  * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
  *              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
  *
@@ -2538 +2539 @@
                                 $args = array( 0 => array() );
                         }
                         $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 );