From 742ae07391c584b6906feeb87e2a4f10849df765 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 22 Aug 2015 08:47:35 +1000 Subject: [PATCH] Tidy up from #1377 --- modules/cms/widgets/MediaManager.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php index 47fba62cd..ec51c76c1 100644 --- a/modules/cms/widgets/MediaManager.php +++ b/modules/cms/widgets/MediaManager.php @@ -963,13 +963,15 @@ class MediaManager extends WidgetBase $fileName = $uploadedFile->getClientOriginalName(); - // If name of our uploadfile not latin + /* + * File name contains non-latin characters, attempt to slug the value + */ if (!$this->validateFileName($fileName)) { $extension = $uploadedFile->getClientOriginalExtension(); - $fileNameWithoutExt = str_replace($extension, "", $fileName); - $fileName = str_slug($fileNameWithoutExt, "-").'.'.$extension; + $fileNameSlug = Str::slug(File::name($fileName), '-'); + $fileName = $fileNameSlug.'.'.$extension; } - + // See mime type handling in the asset manager if (!$uploadedFile->isValid()) {