Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update domain parsing in network classes #6521

Closed
wants to merge 6 commits into from
Closed

Update domain parsing in network classes #6521

wants to merge 6 commits into from
+2 −2

Conversation

spacedmonkey
Copy link
Member

Use parse_url and PHP_URL_HOST to ensure that domain is a 'localhost' and the port is stripped.

Trac ticket: https://core.trac.wordpress.org/ticket/21077

This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

@spacedmonkey
Update domain parsing in network classes
89e919c 
The code has been updated to use the PHP_URL_HOST component when parsing the domain for allow_subdomain_install() method and the cookie_domain property in the WP_Network class. This ensures consistent and accurate extraction of the domain, disregarding any potential path or protocol information.
@spacedmonkey spacedmonkey self-assigned this May 7, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 7, 2024 •
edited

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 props-bot label.

Core Committers: Use this line as a base for the props when committing in SVN:

Props spacedmonkey, johnbillion.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

@spacedmonkey
Refactor allow_subdomain_install code
21861e4 
Adjusted the `allow_subdomain_install` function by reducing the repetitive use of get_option( 'home' ) in the network.php file. This improves readability and the efficiency of the code.
@github-actions GitHub Actions
Copy link

github-actions bot commented May 7, 2024

Test using WordPress Playground

The 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

  • The Plugin and Theme Directories cannot be accessed within Playground.
  • All changes will be lost when closing a tab with a Playground instance.
  • All changes will be lost when refreshing the page.
  • A fresh instance is created each time the link below is clicked.
  • Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
    it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

johnbillion
johnbillion approved these changes May 9, 2024
View reviewed changes
Copy link
Member

@johnbillion johnbillion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Working nicely, thanks.

johnbillion
johnbillion requested changes May 9, 2024
View reviewed changes
Copy link
Member

@johnbillion johnbillion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh maybe not. The unit tests have exploded. Looks like the fix in _set_cookie_domain() needs some more work.

johnbillion and others added 3 commits May 10, 2024 00:10
@johnbillion
Merge branch 'trunk' into fix/multisite-login
498384e
@spacedmonkey
Update cookie domain assignment in WP_Network class
c6979bf 
An enhancement to the cookie domain assignment logic within the WP_Network class has been made. It now uses the parsed domain, if present, otherwise it falls back to the original domain. Additionally, it strips 'www.' from the start of the cookie domain if necessary.
@spacedmonkey
Improve cookie domain parsing logic
d3cf16f 
The bug in the existing logic for parsing cookie domain in the WP_Network class has been fixed. The check now ensures that the $domain is a string before attempting to use it as the cookie domain, providing a more robust solution against edge cases.
@johnbillion
Copy link
Member

https://core.trac.wordpress.org/changeset/58138

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnbillion johnbillion johnbillion approved these changes

@JJJ JJJ Awaiting requested review from JJJ

Assignees

@spacedmonkey spacedmonkey

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@spacedmonkey @johnbillion