[BUGFIX] Usage of deprecated returnFilemounts()

Some places in Core still use $GLOBALS['BE_USER']->returnFilemounts()

Resolves: #36405
Releases: 6.0, 6.1
Change-Id: I6252ed1191811a9813e590aa570741d31522895c
Reviewed-on: https://review.typo3.org/19069
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn

diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 23d90db..879610c 100644 (file)
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -869,7 +869,8 @@ class Bootstrap {
        public function initializeBackendUserMounts() {
                // Includes deleted mount pages as well! @TODO: Figure out why ...
                $GLOBALS['WEBMOUNTS'] = $GLOBALS['BE_USER']->returnWebmounts();
-               $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->returnFilemounts();
+               $GLOBALS['BE_USER']->getFileStorages();
+               $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->groupData['filemounts'];
                return $this;
        }
 
@@ -958,4 +959,4 @@ class Bootstrap {
 }
 
 
-?>
\ No newline at end of file
+?>

diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
index 3fc228e..e31e551 100644 (file)
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
@@ -105,7 +105,8 @@ class ElementBrowserController {
                                foreach ($altMountPoints as $filePathRelativeToFileadmindir) {
                                        $GLOBALS['BE_USER']->addFileMount('', $filePathRelativeToFileadmindir, $filePathRelativeToFileadmindir, 1, 'readonly');
                                }
-                               $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->returnFilemounts();
+                               $GLOBALS['BE_USER']->getFileStorages();
+                               $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->groupData['filemounts'];
                        }
                        break;
                }
@@ -166,4 +167,4 @@ class ElementBrowserController {
 }
 
 
-?>
\ No newline at end of file
+?>

diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
index ff7e924..84627db 100644 (file)
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
@@ -44,7 +44,8 @@ class BrowseLinksController {
                        foreach ($altMountPoints as $filePathRelativeToFileadmindir) {
                                $GLOBALS['BE_USER']->addFileMount('', $filePathRelativeToFileadmindir, $filePathRelativeToFileadmindir, 1, 'readonly');
                        }
-                       $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->returnFilemounts();
+                       $GLOBALS['BE_USER']->getFileStorages();
+                       $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->groupData['filemounts'];
                }
                // Render type by user function
                $browserRendered = FALSE;
@@ -84,4 +85,4 @@ class BrowseLinksController {
 }
 
 
-?>
\ No newline at end of file
+?>

diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
index 36daeb7..1ea419e 100644 (file)
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
@@ -28,7 +28,8 @@ class SelectImageController {
                        foreach ($altMountPoints as $filePathRelativeToFileadmindir) {
                                $GLOBALS['BE_USER']->addFileMount('', $filePathRelativeToFileadmindir, $filePathRelativeToFileadmindir, 1, 'readonly');
                        }
-                       $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->returnFilemounts();
+                       $GLOBALS['BE_USER']->getFileStorages();
+                       $GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->groupData['filemounts'];
                }
                // Rendering type by user function
                $browserRendered = FALSE;
@@ -68,4 +69,4 @@ class SelectImageController {
 }
 
 
-?>
\ No newline at end of file
+?>