[BUGFIX] Pass path instead of object to fileExistsInFolder 12/27412/2
authorTymoteusz Motylewski <t.motylewski@gmail.com>
Fri, 7 Feb 2014 13:30:53 +0000 (14:30 +0100)
committerSteffen Ritter <info@rs-websystems.de>
Fri, 7 Feb 2014 18:18:41 +0000 (19:18 +0100)
In ResourceStorage in the method getUniqueName second argument
passed to fileExistsInFolder should be string instead of object.

This fixes an exception thrown when trying to insert magic image
in the RTE.

Resolves: #55763
Releases: 6.2
Change-Id: I4ed624d4ea5a3602936cf8493052ef111a391990
Reviewed-on: https://review.typo3.org/27412
Reviewed-by: Michiel Roos
Reviewed-by: Marcin SÄ…gol
Reviewed-by: Frans Saris
Tested-by: Frans Saris
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
typo3/sysext/core/Classes/Resource/ResourceStorage.php

index 9362084..70a506a 100644 (file)
@@ -2389,7 +2389,7 @@ class ResourceStorage {
                        // The destinations file
                        $theDestFile = $theTestFile;
                        // If the file does NOT exist we return this fileName
-                       if (!$this->driver->fileExistsInFolder($theDestFile, $folder)) {
+                       if (!$this->driver->fileExistsInFolder($theDestFile, $folder->getIdentifier())) {
                                return $theDestFile;
                        }
                }