Merge pull request #225 from Leuchtfeuer/bugfix/TER-271

v6.1.1
Leuchtfeuer · Dec 4, 2024 · 9796749 · 9796749
2 parents ca58b78 + 2d3c320
commit 9796749
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/Classes/EventListener/SecureDownloadsEventListener.php b/Classes/EventListener/SecureDownloadsEventListener.php
@@ -50,7 +50,7 @@ public function onResourceStorageEmitPreGeneratePublicUrlSignal(GeneratePublicUr
                     $driver->determineSecureDownloadsDriverBaseUrl();
                 }
                 if ($resource instanceof ProcessedFile) {
-                    $originalPublicUrl = $driver->getPublicUrl($resource->getOriginalFile()->getIdentifier());
+                    $originalPublicUrl = $driver->getPublicUrl($resource->getOriginalFile()->getIdentifier()) ?? '';
                     $originalPathShouldBeSecured = $this->secureDownloadService->pathShouldBeSecured($originalPublicUrl);
                 }
                 $publicUrl = $driver->getPublicUrl($resource->getIdentifier()) ?? '';

diff --git a/Documentation/About/ChangeLog/6-1-1.rst b/Documentation/About/ChangeLog/6-1-1.rst
@@ -0,0 +1,42 @@
+.. include:: ../../Includes.txt
+
+==========================
+Version 6.1.1 - 2024/12/04
+==========================
+
+This release is a bugfix and maintenance release.
+
+Download
+========
+
+Download this version from the `TYPO3 extension repository <https://extensions.typo3.org/extension/secure_downloads/>`__ or from
+`GitHub <https://github.com/Leuchtfeuer/typo3-secure-downloads/releases/tag/v6.1.1>`__.
+
+Added
+=====
+
+Changed
+=======
+
+* Fix SecureDownloadsEventListener in case originalPublicUrl is null
+
+Deprecated
+==========
+
+Removed
+=======
+
+All Changes
+===========
+This is a list of all changes in this release::
+
+2024-12-04 [BUGFIX] Fix SecureDownloadsEventListener in case originalPublicUrl is null [TER-271] [TER-272] (Commit e2f6671 by Niklas Grieger)
+
+Contributors
+============
+Following people have contributed to this release:
+
+*   Marcus Balasch
+*   Niklas Grieger
+
+Thank you very much for your support. The next drink is on us! 🍻
diff --git a/Documentation/About/ChangeLog/Index.rst b/Documentation/About/ChangeLog/Index.rst
@@ -17,6 +17,7 @@ List of versions
     :titlesonly:
     :glob:
 
+    6-1-1
     6-1-0
     6-0-4
     6-0-3

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -4,7 +4,7 @@
     'title' => 'Secure Downloads',
     'description' => '"Secure Download": Apply TYPO3 access rights to ALL file assets (PDFs, TGZs or JPGs etc. - configurable) - protect them from direct access.',
     'category' => 'fe',
-    'version' => '6.1.0',
+    'version' => '6.1.1',
     'state' => 'stable',
     'author' => 'Dev Leuchtfeuer',
     'author_email' => '[email protected]',
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ List of versions @@
         :titlesonly:
         :glob:
+-1-1
 -1-0
 -0-4
 -0-3
@@ Expand Down @@