FIX incorrect calculation of MAX_FILE_SIZE (#600)

* Fixes incorrect calculation of MAX_FILE_SIZE * Fixes expected bytes in EditableFileFiled test
silverstripe · May 24, 2017 · e86306c · e86306c
1 parent 5777b33
commit e86306c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/model/editableformfields/EditableFileField.php b/code/model/editableformfields/EditableFileField.php
@@ -93,7 +93,7 @@ public function getFormField()
         );
 
         if ($this->MaxFileSizeMB > 0) {
-            $field->getValidator()->setAllowedMaxFileSize($this->MaxFileSizeMB * 1024);
+            $field->getValidator()->setAllowedMaxFileSize($this->MaxFileSizeMB * 1024 * 1024);
         } else {
             $field->getValidator()->setAllowedMaxFileSize(static::get_php_max_file_size());
         }

diff --git a/tests/EditableFileFieldTest.php b/tests/EditableFileFieldTest.php
@@ -61,7 +61,7 @@ public function testUpdatedMaxFileSize()
         $fileField->write();
 
         $formField = $fileField->getFormField();
-        $this->assertEquals($formField->getValidator()->getAllowedMaxFileSize(), 256);
+        $this->assertEquals($formField->getValidator()->getAllowedMaxFileSize(), 262144);
     }
 
 }