Skip to content

Fix: fix issue on zorgsites where (password reset) url is created with first network site url instead of the current site #2

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

Closed
ShunLuk wants to merge 2 commits into from
Closed

Fix: fix issue on zorgsites where (password reset) url is created with first network site url instead of the current site #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f13ceb6
Fix: fix issue on zorgsites where (password reset) url is created with
ShunLuk May 20, 2026
30d9d04
style: apply php-cs-fixer changes
yard-bot May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/URLFixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,15 @@ public function fixSiteURL(string $url): string
}

/**
* Ensure that the network site URL contains the /wp subdirectory.
* Ensure that the network site URL contains the /wp subdirectory and uses the current request host.
*/
public function fixNetworkSiteURL(string $url, string $path): string
{
$path = ltrim($path, '/');
$url = substr($url, 0, strlen($url) - strlen($path));

$scheme = is_ssl() ? 'https' : 'http';
$host = $_SERVER['HTTP_HOST'] ?? parse_url($url, PHP_URL_HOST);
$url = $scheme . '://' . $host . '/';

Comment on lines +59 to 62
if (substr($url, -3) !== 'wp/') {
Comment on lines 62 to 63
$url .= 'wp/';
Expand Down