Merge branch '1.4' into 1

This commit is contained in:
Robbie Averill 2018-02-22 11:37:26 +13:00
commit 24ee5a186e
2 changed files with 28 additions and 23 deletions

View File

@ -80,6 +80,7 @@ class SubsiteDomain extends DataObject
public function onAfterWrite()
{
Subsite::writeHostMap();
parent::onAfterWrite();
}
/**

View File

@ -1,25 +1,29 @@
{
"name": "silverstripe/subsites",
"description": "Run multiple sites from a single SilverStripe install.",
"license": "BSD-3-Clause",
"type": "silverstripe-module",
"keywords": ["silverstripe", "subsites", "multisite"],
"authors": [
{
"name": "Sam Minnee",
"email": "sam@silverstripe.com"
}
],
"require": {
"silverstripe/framework": "~3.2",
"silverstripe/cms": "~3.2"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7@stable"
},
"extra": {
"branch-alias": {
"1.x-dev": "1.5.x-dev"
}
}
"name": "silverstripe/subsites",
"description": "Run multiple sites from a single SilverStripe install.",
"license": "BSD-3-Clause",
"type": "silverstripe-module",
"keywords": [
"silverstripe",
"subsites",
"multisite"
],
"authors": [
{
"name": "Sam Minnee",
"email": "sam@silverstripe.com"
}
],
"require": {
"silverstripe/framework": "~3.2",
"silverstripe/cms": "~3.2"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7@stable"
},
"extra": {
"branch-alias": {
"1.x-dev": "1.5.x-dev"
}
}
}