This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
Prepend CSS src with correct url scheme #10240
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
mikejolley
added
status: needs review
focus: global styles
woocommercebot
requested review from
a team and
tarhi-saad
and removed request for
a team
|
The release ZIP for this PR is accessible via: Script Dependencies ReportThere is no changed script dependency between this branch and trunk. This comment was automatically generated by the TypeScript Errors Report
🎉 🎉 This PR does not introduce new TS errors. |
|
Size Change: 0 B Total Size: 1.36 MB ℹ️ View Unchanged
|
tarhi-saad
reviewed
Jul 17, 2023
There was a problem hiding this comment.
Thank you, @mikejolley, for the fix! I've left a comment below!
src/BlockTypes/ClassicTemplate.php
Outdated
| wp_enqueue_style( $handle, $style['src'], $style['deps'], $style['version'], $style['media'] ); | ||
| wp_enqueue_style( | ||
| $handle, | ||
| substr( $style['src'], 0, 2 ) === '//' ? 'https:' . $style['src'] : $style['src'], |
There was a problem hiding this comment.
@mikejolley, shouldn't we also handle the case of no secure websites (HTTP)? This worked fine on my Jurassic Ninja test site but not on my local development site. Maybe there is a solution to include both protocols, or we can do a check as follows:
$protocol = strtolower( substr( $_SERVER[ "SERVER_PROTOCOL" ], 0, 5 ) ) == 'https' ? 'https' : 'http';I've tested with $_SERVER['HTTPS'], but it doesn't return the correct values on my local server.
There was a problem hiding this comment.
@tarhi-saad I added set_url_scheme. That takes care of it for us.
tarhi-saad
approved these changes
Jul 18, 2023
github-actions
bot
added
status: ready to merge
and removed
status: needs review
labels
mikejolley
force-pushed
the
fix/10170-css-path
branch
from
a854ceb to
7255336
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Styles from themes (2023 for example) were not working in the editor because the src began with
//. This fixes the issue by ensuring there is ahttps://prefix.Fixes #10170
Screenshots
Testing
User Facing Testing
Changelog