Index: branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php
===================================================================
diff -u -N -r16650 -r16687
--- branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 16650)
+++ branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php	(.../upload_formatter.php)	(revision 16687)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upload_formatter.php 16650 2020-12-17 08:57:57Z alex $
+* @version	$Id: upload_formatter.php 16687 2021-03-16 08:28:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -217,7 +217,9 @@
 				// we can get mime type based on file content and don't use one, provided by the client
 //				$value['type'] = kUtil::mimeContentType($value['tmp_name']);
 
-				if ( getArrayValue($options, 'file_types') && !$this->extensionMatch($value['name'], $options['file_types']) ) {
+				if ( getArrayValue($options, 'file_types')
+					&& !$this->fileHelper->extensionMatch($value['name'], $options['file_types'])
+				) {
 					// match by file extensions
 					$error_params = Array (
 						'file_name' => $value['name'],
@@ -308,21 +310,18 @@
 	/**
 	 * Checks, that given file name has on of provided file extensions
 	 *
-	 * @param string $filename
-	 * @param string $file_types
-	 * @return bool
-	 * @access protected
+	 * @param string $filename   Filename.
+	 * @param string $file_types File types.
+	 *
+	 * @return     boolean
+	 * @deprecated 5.2.2-B2
+	 * @see        FileHelper::extensionMatch()
 	 */
 	protected function extensionMatch($filename, $file_types)
 	{
-		if ( preg_match_all('/\*\.(.*?)(;|$)/', $file_types, $regs) ) {
-			$file_extension = mb_strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-			$file_extensions = array_map('mb_strtolower', $regs[1]);
+		kUtil::deprecatedMethod(__METHOD__, '5.2.2-B2', 'FileHelper::extensionMatch');
 
-			return in_array($file_extension, $file_extensions);
-		}
-
-		return true;
+		return $this->fileHelper->extensionMatch($filename, $file_types);
 	}
 
 	/**