fix: update the logic of fetching current url in loginout block#70031
Merged
Mamaduka merged 3 commits intoWordPress:trunkfrom May 1, 2025
Merged
Conversation
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
Mamaduka
added
[Type] Enhancement
t-hamano
reviewed
May 1, 2025
Contributor
t-hamano
left a comment
t-hamano
left a comment
There was a problem hiding this comment.
Thanks for the PR! Could you update each section of the description according to the actual changes?
Comment on lines
19
to
21
| // This current url fetching logic matches with the core: https://github.com/WordPress/WordPress/blob/6612d90f6c8ee9e917dc2dfcbcc24e120a5746ea/wp-includes/general-template.php#L528 | ||
| // Build the redirect URL. | ||
| $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
Contributor
There was a problem hiding this comment.
Suggested change
| // This current url fetching logic matches with the core: https://github.com/WordPress/WordPress/blob/6612d90f6c8ee9e917dc2dfcbcc24e120a5746ea/wp-includes/general-template.php#L528 | |
| // Build the redirect URL. | |
| $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; | |
| /* | |
| * Build the redirect URL. This current url fetching logic matches with the core. | |
| * | |
| * @see https://github.com/WordPress/wordpress-develop/blob/6bf62e58d21739938f3bb3f9e16ba702baf9c2cc/src/wp-includes/general-template.php#L528. | |
| */ | |
| $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
- Let's use the PHPDoc format.
- It would be good to reference the development repo (
WordPress/wordpress-develop), not the mirror repo (WordPress/WordPress),
chriszarate
pushed a commit
to chriszarate/gutenberg
that referenced
this pull request
Jul 1, 2025
Co-authored-by: SH4LIN <sh4lin@git.wordpress.org> Co-authored-by: t-hamano <wildworks@git.wordpress.org> Co-authored-by: Mamaduka <mamaduka@git.wordpress.org>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What?
Closes: #70024
Why?
Our current method for retrieving the current URL is as follows:
This approach relies on
is_ssl()and$_SERVER['HTTP_HOST'], and it accesses$_SERVER['HTTP_HOST']without checking if it is set. It also lacks proper usage ofwp_unslash()and sanitization.What is your proposed solution?
Why rely on
$_SERVER['HTTP_HOST']andis_ssl()when we can construct the URL directly using:This provides a more secure and WordPress-native approach.
How?
Testing Instructions