[BUGFIX] Prevent fatal when getPublicUrl is called on folder

beechit · Apr 12, 2016 · c72aa9b · c72aa9b
1 parent 5944f4a
commit c72aa9b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Classes/Aspects/PublicUrlAspect.php b/Classes/Aspects/PublicUrlAspect.php
@@ -68,27 +68,27 @@ public function setEnabled($enabled)
      *
      * @param Resource\ResourceStorage $storage
      * @param Resource\Driver\DriverInterface $driver
-     * @param Resource\FileInterface $file
+     * @param Resource\ResourceInterface $resourceObject
      * @param $relativeToCurrentScript
      * @param array $urlData
      * @return void
      */
     public function generatePublicUrl(
         Resource\ResourceStorage $storage,
         Resource\Driver\DriverInterface $driver,
-        Resource\FileInterface $file,
+        Resource\ResourceInterface $resourceObject,
         $relativeToCurrentScript,
         array $urlData
     ) {
 
         // We only render special links for non-public files
-        if ($this->enabled && !$storage->isPublic()) {
+        if ($this->enabled && $resourceObject instanceof Resource\FileInterface && !$storage->isPublic()) {
             $queryParameterArray = array('eID' => 'dumpFile', 't' => '');
-            if ($file instanceof Resource\File) {
-                $queryParameterArray['f'] = $file->getUid();
+            if ($resourceObject instanceof Resource\File) {
+                $queryParameterArray['f'] = $resourceObject->getUid();
                 $queryParameterArray['t'] = 'f';
-            } elseif ($file instanceof Resource\ProcessedFile) {
-                $queryParameterArray['p'] = $file->getUid();
+            } elseif ($resourceObject instanceof Resource\ProcessedFile) {
+                $queryParameterArray['p'] = $resourceObject->getUid();
                 $queryParameterArray['t'] = 'p';
             }
             $queryParameterArray['token'] = GeneralUtility::hmac(