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

Merge branch '1.4' into 1

This commit is contained in:
Robbie Averill 2018-02-22 11:37:26 +13:00
parent 742c4a7fa3 e04d04dc70
commit 24ee5a186e
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/model/SubsiteDomain.php
View File

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

50
composer.json
View File

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