Repository navigation
Fixes issue with incorrect urls in signup and activation flow for mul… - #12257
hasukmistry wants to merge 6 commits into
Conversation
|
Hi there! 👋 Thank you for your contribution to WordPress! 💖 It looks like this is your first pull request to No one monitors this repository for new pull requests. Pull requests must be attached to a Trac ticket to be considered for inclusion in WordPress Core. To attach a pull request to a Trac ticket, please include the ticket's full URL in your pull request description. Pull requests are never merged on GitHub. The WordPress codebase continues to be managed through the SVN repository that this GitHub repository mirrors. Please feel free to open pull requests to work on any contribution you are making. More information about how GitHub pull requests can be used to contribute to WordPress can be found in the Core Handbook. Please include automated tests. Including tests in your pull request is one way to help your patch be considered faster. To learn about WordPress' test suites, visit the Automated Testing page in the handbook. If you have not had a chance, please review the Contribute with Code page in the WordPress Core Handbook. The Developer Hub also documents the various coding standards that are followed:
Thank you, |
|
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 Core Committers: Use this line as a base for the props when committing in SVN: To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
Test using WordPress PlaygroundThe changes in this pull request can previewed and tested using a WordPress Playground instance. WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser. Some things to be aware of
For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation. |
f5f619f to
8f05b2c
Compare
…tisite environment
… wp-activate.php and wp-signup.php Co-authored-by: Weston Ruter <[email protected]>
8f05b2c to
5406b49
Compare
| esc_url( wp_lostpassword_url() ) | ||
| ); | ||
| } else { | ||
| $url = ( is_ssl() ? 'https://' : 'http://' ) . $signup->domain . $blog_details->path; |
There was a problem hiding this comment.
When analyzing at the changes in this PR with PHPStan, I found 3 errors:
156 Binary operation "." between 'http://'|'https://' and mixed results in an error.
🪪 binaryOp.invalid
156 Cannot access property $domain on mixed.
🪪 property.nonObject
156 Cannot access property $path on WP_Site|null.
🪪 property.nonObject
These are not introduced by this PR, but in the interest of cleaning such issues up as we go, I've added a couple commits to this PR to address type issues with the related code.
When an already-active signup is revisited, `wp-activate.php` hard-coded the `http://` scheme and passed the scheme-less domain and path through `esc_url()`, which prepended its own `http://` and produced a doubled, broken `http://http://` link. Build the full URL with the correct scheme from `is_ssl()` before escaping it. Additionally, the signup confirmation heading in `wp-signup.php` now uses a scheme-relative `//` URL so the link honors the network's HTTPS configuration instead of forcing `http`. This also hardens related code in `wp-activate.php` and `wpmu_activate_signup()` against type issues surfaced by PHPStan, including normalizing the signup meta to always be an array. Developed in #12257. Follow-up to r12603, r48672, r57625. Props meet_hasmukh, westonruter. See #64898. Fixes #65506. git-svn-id: https://develop.svn.wordpress.org/trunk@62651 602fd350-edb4-49c9-b593-d223f7449a82
When an already-active signup is revisited, `wp-activate.php` hard-coded the `http://` scheme and passed the scheme-less domain and path through `esc_url()`, which prepended its own `http://` and produced a doubled, broken `http://http://` link. Build the full URL with the correct scheme from `is_ssl()` before escaping it. Additionally, the signup confirmation heading in `wp-signup.php` now uses a scheme-relative `//` URL so the link honors the network's HTTPS configuration instead of forcing `http`. This also hardens related code in `wp-activate.php` and `wpmu_activate_signup()` against type issues surfaced by PHPStan, including normalizing the signup meta to always be an array. Developed in WordPress/wordpress-develop#12257. Follow-up to r12603, r48672, r57625. Props meet_hasmukh, westonruter. See #64898. Fixes #65506. Built from https://develop.svn.wordpress.org/trunk@62651 git-svn-id: http://core.svn.wordpress.org/trunk@61936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Trac ticket: https://core.trac.wordpress.org/ticket/65506