Fixed error 500 if internal attachment path was not resolvable to an URL

jbtronics · jbtronics · commit 1daf6f01f4d7 · 2025-03-27T21:40:51.000+01:00
This fixes issue #898
diff --git a/src/Services/EntityURLGenerator.php b/src/Services/EntityURLGenerator.php
@@ -156,8 +156,10 @@ public function timeTravelURL(AbstractDBElement $entity, \DateTimeInterface $dat
 
     public function viewURL(Attachment $entity): string
     {
-        if ($entity->hasInternal()) {
-            return $this->attachmentURLGenerator->getInternalViewURL($entity);
+        //If the underlying file path is invalid, null gets returned, which is not allowed here.
+        //We still have the chance to use an external path, if it is set.
+        if ($entity->hasInternal() && ($url = $this->attachmentURLGenerator->getInternalViewURL($entity)) !== null) {
+            return $url;
         }
 
         if($entity->hasExternal()) {

Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,10 @@ public function timeTravelURL(AbstractDBElement $entity, \DateTimeInterface $dat`
`156`	`156`
`157`	`157`	`public function viewURL(Attachment $entity): string`
`158`	`158`	`{`
`159`		`- if ($entity->hasInternal()) {`
`160`		`- return $this->attachmentURLGenerator->getInternalViewURL($entity);`
	`159`	`+ //If the underlying file path is invalid, null gets returned, which is not allowed here.`
	`160`	`+ //We still have the chance to use an external path, if it is set.`
	`161`	`+ if ($entity->hasInternal() && ($url = $this->attachmentURLGenerator->getInternalViewURL($entity)) !== null) {`
	`162`	`+ return $url;`
`161`	`163`	`}`
`162`	`164`
`163`	`165`	`if($entity->hasExternal()) {`