From 43613a63a32e76d1d7fb041049ebb50acfad9795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 22 Feb 2025 16:57:08 +0100
Subject: [PATCH] Fixed upload error

---
 src/Entity/Attachments/Attachment.php               | 9 +++++++--
 src/Services/Attachments/AttachmentPathResolver.php | 8 ++++++--
 templates/parts/edit/edit_form_styles.html.twig     | 2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Entity/Attachments/Attachment.php b/src/Entity/Attachments/Attachment.php
index 9518d2f9..3c8d890d 100644
--- a/src/Entity/Attachments/Attachment.php
+++ b/src/Entity/Attachments/Attachment.php
@@ -609,12 +609,17 @@ abstract class Attachment extends AbstractNamedDBElement
     /**
      * Checks if the given path is a path to a builtin resource.
      *
-     * @param string $path The path that should be checked
+     * @param string|null $path The path that should be checked
      *
      * @return bool true if the path is pointing to a builtin resource
      */
-    public static function checkIfBuiltin(string $path): bool
+    public static function checkIfBuiltin(?string $path): bool
     {
+        //An empty path can't be a builtin
+        if ($path === null) {
+            return false;
+        }
+
         //After the %PLACEHOLDER% comes a slash, so we can check if we have a placeholder via explode
         $tmp = explode('/', $path);
         //Builtins must have a %PLACEHOLDER% construction
diff --git a/src/Services/Attachments/AttachmentPathResolver.php b/src/Services/Attachments/AttachmentPathResolver.php
index e3e7a3ca..1b52c89b 100644
--- a/src/Services/Attachments/AttachmentPathResolver.php
+++ b/src/Services/Attachments/AttachmentPathResolver.php
@@ -115,12 +115,16 @@ class AttachmentPathResolver
      * Converts an relative placeholder filepath (with %MEDIA% or older %BASE%) to an absolute filepath on disk.
      * The directory separator is always /. Relative pathes are not realy possible (.. is striped).
      *
-     * @param string $placeholder_path the filepath with placeholder for which the real path should be determined
+     * @param string|null $placeholder_path the filepath with placeholder for which the real path should be determined
      *
      * @return string|null The absolute real path of the file, or null if the placeholder path is invalid
      */
-    public function placeholderToRealPath(string $placeholder_path): ?string
+    public function placeholderToRealPath(?string $placeholder_path): ?string
     {
+        if (null === $placeholder_path) {
+            return null;
+        }
+
         //The new attachments use %MEDIA% as placeholders, which is the directory set in media_directory
         //Older path entries are given via %BASE% which was the project root
 
diff --git a/templates/parts/edit/edit_form_styles.html.twig b/templates/parts/edit/edit_form_styles.html.twig
index 1175e32c..d90242f8 100644
--- a/templates/parts/edit/edit_form_styles.html.twig
+++ b/templates/parts/edit/edit_form_styles.html.twig
@@ -188,7 +188,7 @@
                             <img class="img-fluid img-thumbnail thumbnail-sm" src="{{ attachment_thumbnail(attach, 'thumbnail_md') }}" alt="{% trans %}attachment.preview.alt{% endtrans %}" />
                         </a>
                     {% else %}
-                        <a href="{{ entity_url(attach, 'file_view') }}" rel="noopener" target="_blank" data-turbo="false" class="link-external">{% trans %}attachment.view{% endtrans %}</a>
+                        <a href="{{ entity_url(attach, 'file_view') }}" rel="noopener" target="_blank" data-turbo="false" class="link-external">{% trans %}attachment.view_local{% endtrans %}</a>
                     {% endif %}
                 {% else %}
                     <br><br>