Merge pull request #23 from jonnitto/bugfix/resource_image_source

BUGFIX: Fix broken ResourceImageSource
sitegeist · Aug 15, 2020 · 948e457 · 948e457
2 parents 442dfec + d89ae4d
commit 948e457
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Classes/EelHelpers/ResourceImageSourceHelper.php b/Classes/EelHelpers/ResourceImageSourceHelper.php
@@ -30,14 +30,17 @@ class ResourceImageSourceHelper extends AbstractImageSourceHelper
      * @param string $package
      * @param string $path
      */
-    public function __construct(string $package, string $path)
+    public function __construct(?string $package, string $path)
     {
         $this->package = $package;
         $this->path = $path;
     }
 
     public function src(): string
     {
-        return $this->resourceManager->getPublicPackageResourceUri($this->package, $this->path);
+        if ($this->package) {
+            return $this->resourceManager->getPublicPackageResourceUri($this->package, $this->path);
+        }
+        return $this->resourceManager->getPublicPackageResourceUriByPath($this->path);
     }
 }
diff --git a/Resources/Private/Fusion/Prototypes/ResourceImageSource.fusion b/Resources/Private/Fusion/Prototypes/ResourceImageSource.fusion
@@ -1,5 +1,5 @@
 prototype(Sitegeist.Kaleidoscope:ResourceImageSource) {
     @class = 'Sitegeist\\Kaleidoscope\\FusionObjects\\ResourceImageSourceImplementation'
     path = null
-    package = false
+    package = null
 }