[BUGFIX] Fix array_merge when creating FAL access rights

The arguments of array_merge need to be changed, otherwise
the default settings always win.

Change-Id: Ic430e5fdc2f8e5ec868ec2f5a7c0dd21c28a408c
Fixes: #44429
Releases: 6.1,6.0
Reviewed-on: https://review.typo3.org/17446
Reviewed-by: Mattias Nilsson
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
Reviewed-on: https://review.typo3.org/17479

diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 8e7944d..2835d56 100644 (file)
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -1715,7 +1715,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
                $storagePermissionsArray = $this->getTSConfig('permissions.file.storage.' . $storageObject->getUid());
                $storageFilePermissions = $storagePermissionsArray['properties'];
                if (is_array($storageFilePermissions) && count($storageFilePermissions)) {
-                       return array_merge($storageFilePermissions, $defaultFilePermissions);
+                       return array_merge($defaultFilePermissions, $storageFilePermissions);
                } else {
                        return $defaultFilePermissions;
                }