Ticket #37011: 37011.1.diff

src/wp-includes/general-template.php

@@ -976 +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.
                  */
-                $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 )
-                );
+                if ( is_home() || is_front_page() ) {
+                        // If on the home or front page, don’t link the logo to home.
+                        $html = wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr );
+                } else {
+                        $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 )
+                        );
+                }
         } elseif ( is_customize_preview() ) {
                 // If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
                 $html = sprintf(