tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 09:05:55 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Set absolute domain of 'main site' properly. (from r80951)

Browse Source
This commit is contained in:
Tom Rix 2010-03-01 02:53:15 +00:00
parent 503ec12dd8
commit e83287fd2d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/SiteTreeSubsites.php
View File

@ -224,7 +224,10 @@ class SiteTreeSubsites extends DataObjectDecorator {
// Generate the existing absolute URL and replace the domain with the subsite domain. // Generate the existing absolute URL and replace the domain with the subsite domain.
// This helps deal with Link() returning an absolute URL. // This helps deal with Link() returning an absolute URL.
$url = Director::absoluteURL($this->owner->Link()); $url = Director::absoluteURL($this->owner->Link());
return preg_replace('/\/\/[^\/]+\//', '//' . $this->owner->Subsite()->domain() . '/', $url); if($this->owner->SubsiteID) {
$url = preg_replace('/\/\/[^\/]+\//', '//' . $this->owner->Subsite()->domain() . '/', $url);
}
return $url;
} }
} }

4
code/Subsite.php
View File

@ -114,6 +114,10 @@ class Subsite extends DataObject implements PermissionProvider {
$domain = str_replace('.www.','.', $domain); $domain = str_replace('.www.','.', $domain);
return $domain; return $domain;
} }
// SubsiteID = 0 is often used to refer to the main site, just return $_SERVER['HTTP_HOST']
} else {
return $_SERVER['HTTP_HOST'];
} }
} }