Revert "[BUGFIX] Admin users should ignore user mounts" 36/42636/10
authorHelmut Hummel <helmut.hummel@typo3.org>
Fri, 14 Aug 2015 22:24:07 +0000 (00:24 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Thu, 8 Oct 2015 13:24:16 +0000 (15:24 +0200)
This patch was incomplete:
* TCA still contains mounts for admins
* Group mounts are still respected

Besides that, there are options in the user record to disable that behavior.

Besides that, it is the concept of mounts, that it is useful to see submounts of a global mount.

This reverts commit f262ddef067d3450db05491d39c762f39a9fb826.

Resolves: #70493
Reverts: #57587
Releases: master
Change-Id: Id687402901d6246c66bfca38b800a7947d099308
Reviewed-on: http://review.typo3.org/42636
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php

index e40368c..ad97655 100644 (file)
@@ -1228,14 +1228,10 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
                        $this->dataLists['allowed_languages'] = $this->user['allowed_languages'];
                        // Set user value for workspace permissions.
                        $this->dataLists['workspace_perms'] = $this->user['workspace_perms'];
-                       // User mount points are only added if the user is not an admin as admins do not have visible
-                       // mountpoints fields. Processing them loads mountpoints defined when the user was a non-admin.
-                       if (!$this->isAdmin()) {
-                               // Database mountpoints
-                               $this->dataLists['webmount_list'] = $this->user['db_mountpoints'];
-                               // File mountpoints
-                               $this->dataLists['filemount_list'] = $this->user['file_mountpoints'];
-                       }
+                       // Database mountpoints
+                       $this->dataLists['webmount_list'] = $this->user['db_mountpoints'];
+                       // File mountpoints
+                       $this->dataLists['filemount_list'] = $this->user['file_mountpoints'];
                        // Fileoperation permissions
                        $this->dataLists['file_permissions'] = $this->user['file_permissions'];
                        // Setting default User TSconfig: