Changeset 58213

Timestamp:

05/27/2024 04:39:13 PM (7 months ago)

Author:

joedolson

Message:

Themes: Accessibility: Logo block returns empty link when image not set.

The logo block does not use theme mods, and instead saves a site-wide option site_logo to use as the site logo.

Add handling for cases where the logo image does not exist and delete the site_logo option when the attachment configured as site logo is deleted.

Props afercia, joedolson, khokansardar, SergeyBiryukov.
Fixes #60922.

Location:

trunk/src/wp-includes

Files:

• general-template.php (modified) (4 diffs)
• theme.php (modified) (2 diffs)

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

@@ -1025 +1025 @@
 
     $custom_logo_id = get_theme_mod( 'custom_logo' );
+    $is_image       = wp_attachment_is_image( $custom_logo_id );
 
     if ( $switched_blog ) {
@@ -1030 +1031 @@
     }
 
-    return (bool) $custom_logo_id;
+    return $is_image;
 }
 
@@ -1053 +1054 @@
     }
 
-    $custom_logo_id = get_theme_mod( 'custom_logo' );
-
     // We have a logo. Logo is go.
-    if ( $custom_logo_id ) {
+    if ( has_custom_logo() ) {
+        $custom_logo_id   = get_theme_mod( 'custom_logo' );
         $custom_logo_attr = array(
             'class'   => 'custom-logo',
@@ -1098 +1098 @@
         $image = wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr );
 
-        if ( $unlink_homepage_logo && is_front_page() && ! is_paged() ) {
-            // If on the home page, don't link the logo to home.
-            $html = sprintf(
-                '<span class="custom-logo-link">%1$s</span>',
-                $image
-            );
-        } 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>%3$s</a>',
-                esc_url( home_url( '/' ) ),
-                $aria_current,
-                $image
-            );
+        // Check that we have a proper HTML img element.
+        if ( $image ) {
+
+            if ( $unlink_homepage_logo && is_front_page() && ! is_paged() ) {
+                // If on the home page, don't link the logo to home.
+                $html = sprintf(
+                    '<span class="custom-logo-link">%1$s</span>',
+                    $image
+                );
+            } 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>%3$s</a>',
+                    esc_url( home_url( '/' ) ),
+                    $aria_current,
+                    $image
+                );
+            }
         }
     } elseif ( is_customize_preview() ) {

trunk/src/wp-includes/theme.php

@@ -3435 +3435 @@
  * @since 4.3.0 Also removes `header_image_data`.
  * @since 4.5.0 Also removes custom logo theme mods.
+ * @since 6.6.0 Also removes `site_logo` option set by the site logo block.
  *
  * @param int $id The attachment ID.
@@ -3443 +3444 @@
     $background_image = get_background_image();
     $custom_logo_id   = get_theme_mod( 'custom_logo' );
+    $site_logo_id     = get_option( 'site_logo' );
 
     if ( $custom_logo_id && $custom_logo_id == $id ) {
         remove_theme_mod( 'custom_logo' );
         remove_theme_mod( 'header_text' );
+    }
+
+    if ( $site_logo_id && $site_logo_id == $id ) {
+        delete_option( 'site_logo' );
     }