FIX Support blacklist for SS 4.0 and 4.1, remove old Translatable ref…

…erence in test class
silverstripe · Mar 15, 2018 · 30454dc · 30454dc
1 parent 6feec1d
commit 30454dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php
@@ -487,9 +487,13 @@ public function canCreate($member = null)
         // 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
@@ -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();