Changeset 52042 for trunk/src/wp-includes/blocks/site-logo.php

Timestamp:

11/08/2021 02:26:27 PM (4 years ago)

Author:

youknowriad

Message:

Block Editor: Update the WordPress Packages based on Gutenberg 11.9 RC1.

This brings the JS packages up to date and is the first step that will allow us
to include the other block editor updates for WordPress 5.9:
FSE infrastrucutre, site editor and global styles.

Props noisysocks.
See #54337.

File:

• trunk/src/wp-includes/blocks/site-logo.php (modified) (3 diffs)

trunk/src/wp-includes/blocks/site-logo.php

@@ -134 +134 @@
  */
 function _delete_site_logo_on_remove_custom_logo( $old_value, $value ) {
+    global $_ignore_site_logo_changes;
+
+    if ( $_ignore_site_logo_changes ) {
+        return;
+    }
+
     // If the custom_logo is being unset, it's being removed from theme mods.
     if ( isset( $old_value['custom_logo'] ) && ! isset( $value['custom_logo'] ) ) {
@@ -144 +150 @@
  */
 function _delete_site_logo_on_remove_theme_mods() {
+    global $_ignore_site_logo_changes;
+
+    if ( $_ignore_site_logo_changes ) {
+        return;
+    }
+
     if ( false !== get_theme_support( 'custom-logo' ) ) {
         delete_option( 'site_logo' );
@@ -161 +173 @@
 }
 add_action( 'setup_theme', '_delete_site_logo_on_remove_custom_logo_on_setup_theme', 11 );
+
+/**
+ * Removes the custom_logo theme-mod when the site_logo option gets deleted.
+ */
+function _delete_custom_logo_on_remove_site_logo() {
+    global $_ignore_site_logo_changes;
+
+    // Prevent _delete_site_logo_on_remove_custom_logo and
+    // _delete_site_logo_on_remove_theme_mods from firing and causing an
+    // infinite loop.
+    $_ignore_site_logo_changes = true;
+
+    // Remove the custom logo.
+    remove_theme_mod( 'custom_logo' );
+
+    $_ignore_site_logo_changes = false;
+}
+add_action( 'delete_option_site_logo', '_delete_custom_logo_on_remove_site_logo' );