[BUGFIX] Usage of deprecated returnFilemounts() 13/18513/2
authorMarkus Klein <klein.t3@mfc-linz.at>
Wed, 27 Feb 2013 12:06:46 +0000 (13:06 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 19 Mar 2013 20:31:56 +0000 (21:31 +0100)
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/18513
Reviewed-by: Dmitry Dulepov
Tested-by: Dmitry Dulepov
Reviewed-by: Wouter Wolters
Reviewed-by: Sebastian Fischer
Reviewed-by: Christian Weiske
Tested-by: Christian Weiske
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/core/Classes/Core/Bootstrap.php
typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php

index ee75c2c..55a9fd3 100644 (file)
@@ -905,7 +905,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;
        }
 
index e53fa99..3ca1baa 100644 (file)
@@ -131,7 +131,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;
                }
@@ -192,4 +193,4 @@ class ElementBrowserController {
 }
 
 
-?>
\ No newline at end of file
+?>
index a5b0ad0..4f02810 100644 (file)
@@ -71,7 +71,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;
@@ -111,4 +112,4 @@ class BrowseLinksController {
 }
 
 
-?>
\ No newline at end of file
+?>
index 9022101..4225c1c 100644 (file)
@@ -55,7 +55,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;
@@ -95,4 +96,4 @@ class SelectImageController {
 }
 
 
-?>
\ No newline at end of file
+?>