From 4db92fa8b5954313675cf1643d784112db338f3b Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 5 Dec 2015 08:47:07 +1100 Subject: [PATCH] Alt fix for #1585 --- modules/backend/formwidgets/FileUpload.php | 4 +--- modules/system/ServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php index f5ec779dd..7bcc47601 100644 --- a/modules/backend/formwidgets/FileUpload.php +++ b/modules/backend/formwidgets/FileUpload.php @@ -255,9 +255,7 @@ class FileUpload extends FormWidgetBase return $value; }, $types); - $types = implode(',', $types); - - return $types . ',' . strtoupper($types); + return implode(',', $types); } /** diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php index d8913f8ef..02a4d4086 100644 --- a/modules/system/ServiceProvider.php +++ b/modules/system/ServiceProvider.php @@ -457,7 +457,7 @@ class ServiceProvider extends ModuleServiceProvider * - extensions: png,jpg,txt */ Validator::extend('extensions', function($attribute, $value, $parameters) { - $extension = $value->getClientOriginalExtension(); + $extension = strtolower($value->getClientOriginalExtension()); return in_array($extension, $parameters); });