Changeset 48039

Timestamp:

06/14/2020 10:00:47 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Accessibility: Themes: Don't link to the home page in get_custom_logo() when it's displayed on the home page.

Props Soean, audrasjb, sabernhardt, FlorianBrinkmann, rianrietveld, afercia, joedolson, samful, knutsp, SergeyBiryukov.
See #37011.

File:

• trunk/src/wp-includes/general-template.php (modified) (4 diffs)

trunk/src/wp-includes/general-template.php

@@ -941 +941 @@
 
 /**
- * Returns a custom logo, linked to home.
+ * Returns a custom logo, linked to home when on another page.
  *
  * @since 4.5.0
+ * @since 5.5.0 Removed the link on the home page.
  *
  * @param int $blog_id Optional. ID of the blog in question. Default is the ID of the current blog.
@@ -966 +967 @@
 
                 /*
-                 * If the logo alt attribute is empty, get the site title and explicitly
-                 * pass it to the attributes used by wp_get_attachment_image().
+                 * If the logo alt attribute is empty, get the site title and explicitly pass it
+                 * to the attributes used by wp_get_attachment_image().
                  */
                 $image_alt = get_post_meta( $custom_logo_id, '_wp_attachment_image_alt', true );
@@ -975 +976 @@
 
                 /*
-                 * If the alt attribute is not empty, there's no need to explicitly pass
-                 * it because wp_get_attachment_image() already adds the alt attribute.
+                 * If the alt attribute is not empty, there's no need to explicitly pass it
+                 * because wp_get_attachment_image() already adds the alt attribute.
                  */
-                $html = sprintf(
-                        '<a href="%1$s" class="custom-logo-link" rel="home">%2$s</a>',
-                        esc_url( home_url( '/' ) ),
-                        wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr )
-                );
+                $image = wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr );
+
+                if ( is_front_page() ) {
+                        // If on the home page, don't link the logo to home.
+                        $html = sprintf(
+                                '<span class="custom-logo-link">%1$s</span>',
+                                $image
+                        );
+                } else {
+                        $html = sprintf(
+                                '<a href="%1$s" class="custom-logo-link" rel="home">%2$s</a>',
+                                esc_url( home_url( '/' ) ),
+                                $image
+                        );
+                }
         } elseif ( is_customize_preview() ) {
                 // If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
@@ -1008 +1019 @@
 
 /**
- * Displays a custom logo, linked to home.
+ * Displays a custom logo, linked to home when on another page.
  *
  * @since 4.5.0