From 1e458ef03d5e0e330ce99ca3df523d15a22d443e Mon Sep 17 00:00:00 2001
From: DorsetDigital <DorsetDigital@users.noreply.github.com>
Date: Wed, 17 Oct 2018 23:20:20 +0100
Subject: [PATCH 1/3] Change source of admin URL in getIsAdmin()

As per #394
Change direct call to the AdminRootController config setting, using instead the admin_url() method on the class which provides detection via the Director rules, and the fallback to the config setting.
---
 src/Middleware/InitStateMiddleware.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Middleware/InitStateMiddleware.php b/src/Middleware/InitStateMiddleware.php
index b5abf0c..abec0ff 100644
--- a/src/Middleware/InitStateMiddleware.php
+++ b/src/Middleware/InitStateMiddleware.php
@@ -62,7 +62,7 @@ class InitStateMiddleware implements HTTPMiddleware
     public function getIsAdmin(HTTPRequest $request)
     {
         $adminPaths = static::config()->get('admin_url_paths');
-        $adminPaths[] = AdminRootController::config()->get('url_base') . '/';
+        $adminPaths[] = AdminRootController::admin_url();
         $currentPath = rtrim($request->getURL(), '/') . '/';
         foreach ($adminPaths as $adminPath) {
             if (substr($currentPath, 0, strlen($adminPath)) === $adminPath) {

From e52fe41a237c88d6e98333d036f9b64722bffd5e Mon Sep 17 00:00:00 2001
From: bergice <andre.kiste@silverstripe.com>
Date: Thu, 18 Oct 2018 18:41:07 +1300
Subject: [PATCH 2/3] BUG: Fix `MigrateFileTask` not migrating files for
 subsites Fixes #352

---
 _config/middleware.yml               |  2 ++
 src/Tasks/SubsiteMigrateFileTask.php | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 src/Tasks/SubsiteMigrateFileTask.php

diff --git a/_config/middleware.yml b/_config/middleware.yml
index beb0a93..5cbf9ca 100644
--- a/_config/middleware.yml
+++ b/_config/middleware.yml
@@ -8,3 +8,5 @@ SilverStripe\Core\Injector\Injector:
     properties:
       Middlewares:
         SubsitesStateMiddleware: %$SilverStripe\Subsites\Middleware\InitStateMiddleware
+  SilverStripe\Dev\Tasks\MigrateFileTask:
+    class: SilverStripe\Subsites\Tasks\SubsiteMigrateFileTask
diff --git a/src/Tasks/SubsiteMigrateFileTask.php b/src/Tasks/SubsiteMigrateFileTask.php
new file mode 100644
index 0000000..ac6dcd6
--- /dev/null
+++ b/src/Tasks/SubsiteMigrateFileTask.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace SilverStripe\Subsites\Tasks;
+
+
+use SilverStripe\Dev\Tasks\MigrateFileTask;
+use SilverStripe\Subsites\Model\Subsite;
+
+class SubsiteMigrateFileTask extends MigrateFileTask
+{
+    public function run($request)
+    {
+        $origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
+        Subsite::disable_subsite_filter(true);
+
+        parent::run($request);
+
+        Subsite::disable_subsite_filter($origDisableSubsiteFilter);
+    }
+}

From 2a6f7b5dfbf402170da2f22bde85de5f52edb2f2 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 18 Oct 2018 11:03:16 +0200
Subject: [PATCH 3/3] Automated linting fix

---
 src/Tasks/SubsiteMigrateFileTask.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tasks/SubsiteMigrateFileTask.php b/src/Tasks/SubsiteMigrateFileTask.php
index ac6dcd6..c00c776 100644
--- a/src/Tasks/SubsiteMigrateFileTask.php
+++ b/src/Tasks/SubsiteMigrateFileTask.php
@@ -2,7 +2,6 @@
 
 namespace SilverStripe\Subsites\Tasks;
 
-
 use SilverStripe\Dev\Tasks\MigrateFileTask;
 use SilverStripe\Subsites\Model\Subsite;