Update for config rewrite

silverstripe · Feb 22, 2017 · 2933a4d · 2933a4d
1 parent 7bf6f91
commit 2933a4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
@@ -907,8 +907,8 @@ public function getObjectFromData(File $file)
         /** @var File $file */
         if ($file->getIsImage()) {
             // Small thumbnail
-            $smallWidth = UploadField::config()->get('thumbnail_width');
-            $smallHeight = UploadField::config()->get('thumbnail_height');
+            $smallWidth = UploadField::config()->uninherited('thumbnail_width');
+            $smallHeight = UploadField::config()->uninherited('thumbnail_height');
             $smallThumbnail = $file->FitMax($smallWidth, $smallHeight);
             if ($smallThumbnail && $smallThumbnail->exists()) {
                 $object['smallThumbnail'] = $smallThumbnail->getAbsoluteURL();
@@ -1014,7 +1014,7 @@ protected function getUpload()
         $upload = Upload::create();
         $upload->getValidator()->setAllowedExtensions(
             // filter out '' since this would be a regex problem on JS end
-            array_filter(File::config()->get('allowed_extensions'))
+            array_filter(File::config()->uninherited('allowed_extensions'))
         );
 
         return $upload;

diff --git a/code/GraphQL/FileTypeCreator.php b/code/GraphQL/FileTypeCreator.php
@@ -164,8 +164,8 @@ public function resolveSmallThumbnailField($object, array $args, $context, $info
         }
 
         // Small thumbnail
-        $smallWidth = UploadField::config()->get('thumbnail_width');
-        $smallHeight = UploadField::config()->get('thumbnail_height');
+        $smallWidth = UploadField::config()->uninherited('thumbnail_width');
+        $smallHeight = UploadField::config()->uninherited('thumbnail_height');
         $smallThumbnail = $object->FitMax($smallWidth, $smallHeight);
         if ($smallThumbnail && $smallThumbnail->exists()) {
             return $smallThumbnail->getAbsoluteURL();
@@ -188,8 +188,8 @@ public function resolveThumbnailField($object, array $args, $context, $info)
         }
 
         // Large thumbnail
-        $width = AssetAdmin::config()->get('thumbnail_width');
-        $height = AssetAdmin::config()->get('thumbnail_height');
+        $width = AssetAdmin::config()->uninherited('thumbnail_width');
+        $height = AssetAdmin::config()->uninherited('thumbnail_height');
         $thumbnail = $object->FitMax($width, $height);
         if ($thumbnail && $thumbnail->exists()) {
             return $thumbnail->getAbsoluteURL();