Fix fatal error in Site Logo block in WP 5.9 #36195
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Restore the _delete_site_logo_on_remove_custom_logo functions _delete_site_logo_on_remove_theme_mods so that they exist when block-library/src/site-logo/index.php is copied to wp-includes/blocks/site-logo.php in Core for WP 5.9. These functions were renamed to have a _gutenberg prefix in 0140ba0 to prevent an infinite loop, see https://github.com/WordPress/gutenberg/pull/34820/files#r710647763. We can prevent an infinite loop using a global variable instead.
noisysocks
added
[Type] Bug
stacimc
approved these changes
Nov 4, 2021
There was a problem hiding this comment.
Thanks for this @noisysocks!
I checked out this branch and also manually copied changes over to the Core wp-includes/blocks/site-logo.php file in my local environment in order to test. I re-tested inserting, updating, and resetting Site Logos through the block and through the Customizer using the original testing instructions from #34820. All tested well for me!
|
Thanks for testing! |
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Follows #34820.
Restore the
_delete_site_logo_on_remove_custom_logoand_delete_site_logo_on_remove_theme_modsfunctions so that they exist whenblock-library/src/site-logo/index.phpis copied towp-includes/blocks/site-logo.phpin Core for WP 5.9 (WordPress/wordpress-develop#1804).This fixes a fatal error in WP 5.9 caused by calling
add_action()with a callback that doesn't exist.These functions were renamed to have a
_gutenbergprefix in 0140ba0 to prevent an infinite loop, see https://github.com/WordPress/gutenberg/pull/34820/files#r710647763.We can prevent the infinite loop using a global variable instead.
How has this been tested?
I haven't tested this. Maybe @stacimc, @andrewserong or @creativecoder can? 😀
Checklist:
*.native.jsfiles for terms that need renaming or removal).