From 6bac3f9251d9655f36b93b266e77bf2b453bc77f Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 14 Feb 2015 21:38:49 +1100 Subject: [PATCH] Fixes broken file uploads --- modules/backend/formwidgets/FileUpload.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php index 9ca0e63e4..1877759cd 100644 --- a/modules/backend/formwidgets/FileUpload.php +++ b/modules/backend/formwidgets/FileUpload.php @@ -47,7 +47,7 @@ class FileUpload extends FormWidgetBase /** * @var mixed Collection of acceptable file types. */ - public $acceptedFileTypes; + public $acceptedFileTypes = false; /** * {@inheritDoc} @@ -128,10 +128,13 @@ class FileUpload extends FormWidgetBase */ public function getAcceptedFileTypes($includeDot = false) { - if (!$types = $this->acceptedFileTypes) { - $types = starts_with($this->getDisplayMode(), 'image') - ? 'jpg,jpeg,bmp,png,gif,svg' - : null; + $types = $this->acceptedFileTypes; + if ($types === false && starts_with($this->getDisplayMode(), 'image')) { + $types = 'jpg,jpeg,bmp,png,gif,svg'; + } + + if (is_null($types)) { + return null; } if (!is_array($types)) {