MAGETWO-90241: Image Uploader maxFileSize configuration can exceed PHP's upload_max_filesize

danmooney2 · danmooney2 · commit 3439f737b335 · 2018-05-01T10:43:17.000-05:00
Null coalesce to zero if maxFileSize is null
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/Image.php
@@ -65,7 +65,7 @@ public function prepare()
     {
         // dynamically set max file size based on php ini config if not present in XML
         $maxFileSize = min(array_filter([
-            $this->getConfiguration()['maxFileSize'] ?? null,
+            $this->getConfiguration()['maxFileSize'] ?? 0,
             $this->fileSize->getMaxFileSize()
         ]));
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function prepare()`
`65`	`65`	`{`
`66`	`66`	`// dynamically set max file size based on php ini config if not present in XML`
`67`	`67`	`$maxFileSize = min(array_filter([`
`68`		`- $this->getConfiguration()['maxFileSize'] ?? null,`
	`68`	`+ $this->getConfiguration()['maxFileSize'] ?? 0,`
`69`	`69`	`$this->fileSize->getMaxFileSize()`
`70`	`70`	`]));`
`71`	`71`