Merge branch '1.4' into 1

2018-02-22 11:37:26 +13:00 · 2018-02-22 11:37:26 +13:00 · 24ee5a186e
parent 742c4a7fa3 e04d04dc70
commit 24ee5a186e
2 changed files with 28 additions and 23 deletions
--- a/code/model/SubsiteDomain.php
+++ b/code/model/SubsiteDomain.php
@ -80,6 +80,7 @@ class SubsiteDomain extends DataObject
    public function onAfterWrite()
    {
        Subsite::writeHostMap();
+        parent::onAfterWrite();
    }
    
    /**
--- a/composer.json
+++ b/composer.json
@ -3,7 +3,11 @@
    "description": "Run multiple sites from a single SilverStripe install.",
    "license": "BSD-3-Clause",
    "type": "silverstripe-module",
-	"keywords": ["silverstripe", "subsites", "multisite"],
+    "keywords": [
+        "silverstripe",
+        "subsites",
+        "multisite"
+    ],
    "authors": [
        {
            "name": "Sam Minnee",