From 8b43faeeaca82d8d374b6ea4c90b30df0e810319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <jan.h.boehmer@gmx.de>
Date: Fri, 22 May 2020 22:24:36 +0200
Subject: [PATCH] Correctly show external picture attachments.

---
 src/DataTables/Column/PartAttachmentsColumn.php | 2 +-
 src/Services/Attachments/AttachmentManager.php  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/DataTables/Column/PartAttachmentsColumn.php b/src/DataTables/Column/PartAttachmentsColumn.php
index f3f43cc7..a7722e76 100644
--- a/src/DataTables/Column/PartAttachmentsColumn.php
+++ b/src/DataTables/Column/PartAttachmentsColumn.php
@@ -96,7 +96,7 @@ class PartAttachmentsColumn extends AbstractColumn
             $tmp .= sprintf(
                 '<a href="%s" title="%s" class="attach-table-icon" target="_blank" rel="noopener" data-no-ajax>%s</a>',
                 $this->urlGenerator->viewURL($attachment),
-                htmlspecialchars($attachment->getName()).': '.htmlspecialchars($attachment->getFilename()),
+                htmlspecialchars($attachment->getName()).': '.htmlspecialchars($attachment->getFilename() ?? $attachment->getHost() ?? ''),
                 $this->FAIconGenerator->generateIconHTML(
                     // Sometimes the extension can not be determined, so ensure a generic icon is shown
                     $this->FAIconGenerator->fileExtensionToFAType($attachment->getExtension() ?? 'file'),
diff --git a/src/Services/Attachments/AttachmentManager.php b/src/Services/Attachments/AttachmentManager.php
index 75d2edcc..5818819e 100644
--- a/src/Services/Attachments/AttachmentManager.php
+++ b/src/Services/Attachments/AttachmentManager.php
@@ -125,13 +125,17 @@ class AttachmentManager
             return false;
         }
 
+        if ($attachment->isExternal()) {
+            return true;
+        }
+
         $absolute_path = $this->toAbsoluteFilePath($attachment);
 
         if (null === $absolute_path) {
             return false;
         }
 
-        return file_exists($absolute_path) || $attachment->isExternal();
+        return file_exists($absolute_path);
     }
 
     /**