Merge pull request #42 from micmania1/patch-1

FIX VersionedFileUploadField::create() conflicts with other modules
symbiote · Oct 23, 2014 · c4181d7 · c4181d7
2 parents a81f971 + 16807c2
commit c4181d7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/VersionedFileExtension.php b/code/VersionedFileExtension.php
@@ -74,7 +74,7 @@ public function updateCMSFields(FieldList $fields) {
 			if(!$this->owner->canEdit()) return;
 
 			$folder = $this->owner->Parent();
-			$uploadField = VersionedFileUploadField::create('ReplacementFile', '');
+			$uploadField = new VersionedFileUploadField('ReplacementFile', '');
 			$uploadField->setConfig('previewMaxWidth', 40);
 			$uploadField->setConfig('previewMaxHeight', 30);
 			$uploadField->setConfig('allowedMaxFileNumber', 1);