From 000a880742a6b43a8ef8bb3958ef2964a7c464f1 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Fri, 29 Jun 2018 14:20:55 +1000 Subject: [PATCH] Alternative fix to #3607 Fixes #3607 Fixes #3606 --- modules/backend/widgets/MediaManager.php | 2 +- modules/system/classes/MediaLibrary.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php index 2d35b29bc..b9de13fbf 100644 --- a/modules/backend/widgets/MediaManager.php +++ b/modules/backend/widgets/MediaManager.php @@ -1205,7 +1205,7 @@ class MediaManager extends WidgetBase */ protected function validateFileName($name) { - if (!preg_match('/^[0-9a-z@\.\s_\-]+$/i', $name)) { + if (!preg_match('/^[\w@\.\s_\-]+$/iu', $name)) { return false; } diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php index 64a6b2783..045f5840b 100644 --- a/modules/system/classes/MediaLibrary.php +++ b/modules/system/classes/MediaLibrary.php @@ -475,7 +475,7 @@ class MediaLibrary /* * Validate folder names */ - if (!preg_match('/^[0-9a-z@\.\s_\-\/]+$/i', $path)) { + if (!preg_match('/^[\w@\.\s_\-\/]+$/iu', $path)) { throw new ApplicationException(Lang::get('system::lang.media.invalid_path', compact('path'))); }