tonyair
/
silverstripe-subsites
mirror of https://github.com/silverstripe/silverstripe-subsites
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use Director::host() over direct $_SERVER access

This commit is contained in:
Robbie Averill 2019-07-29 10:38:14 +02:00
parent 9a7cdbbe2d
commit 09abe2b2f2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Subsite.php
View File

@ -870,7 +870,7 @@ class Subsite extends DataObject
}
// If there are no objects, default to the current hostname
return isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
return Director::host();
}
/**

2
src/Model/SubsiteDomain.php
View File

@ -185,7 +185,7 @@ class SubsiteDomain extends DataObject
*/
public function getSubstitutedDomain()
{
$currentHost = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
$currentHost = Director::host();
// If there are wildcards in the primary domain (not recommended), make some
// educated guesses about what to replace them with: