Changeset 58213 for trunk/src/wp-includes/theme.php

Timestamp:

05/27/2024 04:39:13 PM (8 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.

File:

• trunk/src/wp-includes/theme.php (modified) (2 diffs)

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' );
     }