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

Merge branch '2.0' into 2.1

This commit is contained in:
Robbie Averill 2019-09-25 15:00:00 -07:00
parent ce63a9ed08 917640699d
commit 5cf44c9d02
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

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

2
src/Model/SubsiteDomain.php
View File

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