#2810

diff --git a/src/app/Magic/Fields/Files.php b/src/app/Magic/Fields/Files.php
index e98ffd1d655467f3b00cbb837fa0231561eaa3d5..52c1c23cb6d6aa4757274935ad6b4c7d0c69fc2b 100644 (file)
--- a/src/app/Magic/Fields/Files.php
+++ b/src/app/Magic/Fields/Files.php
@@ -9,11 +9,20 @@ class Files extends Field
     protected $_multiple = false;
     protected $_adminType = 'dropzone_media';
     protected $_databaseType = 'text';
-    protected $_collection = 'files';
-    protected $_thumbCollection = 'thumbs';
+    protected $_collection = null;
+    protected $_thumbCollection = null;
 
     public function getDefaultAttributes()
     {
-        return array_merge(parent::getDefaultAttributes(), ['mime_types' => $this->_mimeTypes, 'collection' => $this->_collection, 'thumb_collection' => $this->_thumbCollection]);
+        $collection = $this->_collection;
+        if (null === $collection) {
+            $collection = $this->getAttribute('name');
+        }
+        $thumbCollection = $this->_thumbCollection;
+        if (null === $thumbCollection) {
+            $thumbCollection = $collection . '_thumbs';
+        }
+
+        return array_merge(parent::getDefaultAttributes(), ['mime_types' => $this->_mimeTypes, 'collection' => $collection, 'thumb_collection' => $thumbCollection]);
     }
 }