From 30454dc04fcc1a1ee75c71f685c66e202b44b267 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 15 Mar 2018 17:15:19 +1300
Subject: [PATCH] FIX Support blacklist for SS 4.0 and 4.1, remove old
 Translatable reference in test class

---
 src/Extensions/SiteTreeSubsites.php   | 8 ++++++--
 tests/php/SubsitesVirtualPageTest.php | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php
index 9dfd90f..1a2533e 100644
--- a/src/Extensions/SiteTreeSubsites.php
+++ b/src/Extensions/SiteTreeSubsites.php
@@ -487,9 +487,13 @@ class SiteTreeSubsites extends DataExtension
         // Typically called on a singleton, so we're not using the Subsite() relation
         $subsite = Subsite::currentSubsite();
         if ($subsite && $subsite->exists() && $subsite->PageTypeBlacklist) {
-            $blacklist = Convert::json2array($subsite->PageTypeBlacklist) ?: [];
+            // SS 4.1: JSON encoded. SS 4.0, comma delimited
+            $blacklist = Convert::json2array($subsite->PageTypeBlacklist);
+            if ($blacklist === false) {
+                $blacklist = explode(',', $subsite->PageTypeBlacklist);
+            }
 
-            if (in_array(get_class($this->owner), $blacklist)) {
+            if (in_array(get_class($this->owner), (array) $blacklist)) {
                 return false;
             }
         }
diff --git a/tests/php/SubsitesVirtualPageTest.php b/tests/php/SubsitesVirtualPageTest.php
index d00b193..99e9646 100644
--- a/tests/php/SubsitesVirtualPageTest.php
+++ b/tests/php/SubsitesVirtualPageTest.php
@@ -21,10 +21,6 @@ class SubsitesVirtualPageTest extends BaseSubsiteTest
         'SubsitesVirtualPageTest.yml',
     ];
 
-    protected static $illegal_extensions = [
-        SiteTree::class => ['Translatable'] // @todo implement Translatable namespace
-    ];
-
     protected function setUp()
     {
         parent::setUp();