From 01d09695a9835286774cb7e3150f883b051249ac Mon Sep 17 00:00:00 2001 From: Jyrki Lilja Date: Wed, 13 Dec 2017 12:03:00 +0200 Subject: [PATCH 1/3] Add parent call to onAfterWrite --- code/model/SubsiteDomain.php | 1 + 1 file changed, 1 insertion(+) diff --git a/code/model/SubsiteDomain.php b/code/model/SubsiteDomain.php index e976a1e6..c3d59aa2 100644 --- a/code/model/SubsiteDomain.php +++ b/code/model/SubsiteDomain.php @@ -80,6 +80,7 @@ public function getTitle() public function onAfterWrite() { Subsite::writeHostMap(); + parent::onAfterWrite(); } /** From e4702dc1320d1013d79bd13a3dbaaf05cc9a3fc1 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 22 Feb 2018 09:25:11 +1300 Subject: [PATCH 2/3] Remove obsolete branch-alias --- composer.json | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index 031b97db..4975a6e2 100644 --- a/composer.json +++ b/composer.json @@ -1,25 +1,25 @@ { - "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.4.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": [] +} \ No newline at end of file From 742c4a7fa31049406a177faa53c388285f4ab147 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 22 Feb 2018 10:22:58 +1300 Subject: [PATCH 3/3] Update branch alias for 1.5.x-dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 031b97db..81f85a42 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ }, "extra": { "branch-alias": { - "1.x-dev": "1.4.x-dev" + "1.x-dev": "1.5.x-dev" } } }