[FOLLOWUP][TASK] FAL: Use file drivers correctly in Folder::getSubfolder 88/40488/3
authorBenjamin Mack <benni@typo3.org>
Sat, 20 Jun 2015 13:14:58 +0000 (15:14 +0200)
committerBenjamin Mack <benni@typo3.org>
Sat, 20 Jun 2015 13:42:21 +0000 (15:42 +0200)
Storage should use folder identifier when accessing the driver

Releases: master
Resolves: #67647
Resolves: #65305
Resolves: #59475
Resolves: #59473
Change-Id: I7cbe71291866ef033bba2fc3c6c06ffe73f909d0
Reviewed-on: http://review.typo3.org/40488
Reviewed-by: Marc Bastian Heinrichs <typo3@mbh-software.de>
Tested-by: Marc Bastian Heinrichs <typo3@mbh-software.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/core/Classes/Resource/ResourceStorage.php

index cc473e8..8e1aabd 100644 (file)
@@ -1998,14 +1998,14 @@ class ResourceStorage implements ResourceStorageInterface {
         * Returns the Identifier for a folder within a given folder.
         *
         * @param string $folderName The name of the target folder
-        * @param string $folder
+        * @param Folder $parentFolder
         * @param bool $returnInaccessibleFolderObject
         * @return Folder|InaccessibleFolder
         * @throws \Exception
         * @throws Exception\InsufficientFolderAccessPermissionsException
         */
-       public function getFolderInFolder($folderName, $folder, $returnInaccessibleFolderObject = FALSE) {
-               $folderIdentifier = $this->driver->getFolderInFolder($folderName, $folder);
+       public function getFolderInFolder($folderName, Folder $parentFolder, $returnInaccessibleFolderObject = FALSE) {
+               $folderIdentifier = $this->driver->getFolderInFolder($folderName, $parentFolder->getIdentifier());
                return $this->getFolder($folderIdentifier, $returnInaccessibleFolderObject);
        }