Handle preg_replace() null in Preload Fonts and update Sucuri logo #7904
+14
−6
Conversation
This file contains hidden or 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
Replace assets/img/logo-sucuri.png with the updated Sucuri logo as requested in wp-media#6991.
Wrap preg_replace() and fall back to original HTML when it returns null to avoid a PHP 8 TypeError in maybe_remove_existing_preloaded_fonts(). Fixes wp-media#7898.
Author
|
Hey, I also added the updated If you’d prefer it separated, I can split it out anytime, just let me know. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR includes two small changes:
Preload Fonts regex safety (fixes Optimize the regex used in maybe_remove_existing_preloaded_fonts #7898)
WP_Rocket\Engine\Media\PreloadFonts\Frontend\Controller::maybe_remove_existing_preloaded_fonts(),wrap the
preg_replace()call and handle the case where it returnsnull(PHP 8+ behavior).preg_replace()fails, we now return the original$htmlinstead of propagatingnull,which avoids a
TypeErrorfor thestringreturn type.Sucuri logo update (fixes Sucuri logo is outdated #6991)
assets/img/logo-sucuri.pngwith the current Sucuri logo, so the UI reflects their latest branding.No other behavior is changed.