fix: Bypass CDN url generation for online media file resources

netlogix · Oct 22, 2024 · 89bca06 · 89bca06
1 parent 11a6332
commit 89bca06
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Classes/EventListener/AddCdnToResource.php b/Classes/EventListener/AddCdnToResource.php
@@ -12,6 +12,7 @@
 use TYPO3\CMS\Core\Resource\Driver\LocalDriver;
 use TYPO3\CMS\Core\Resource\Event\GeneratePublicUrlForResourceEvent;
 use TYPO3\CMS\Core\Resource\File;
+use TYPO3\CMS\Core\Resource\OnlineMedia\Helpers\OnlineMediaHelperRegistry;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Core\Resource\ResourceInterface;
 use TYPO3\CMS\Core\Resource\ResourceStorageInterface;
@@ -53,8 +54,17 @@ public function __invoke(GeneratePublicUrlForResourceEvent $event): void
             return;
         }
 
-        if (($resource->getStorage()->getCapabilities(
-        ) & ResourceStorageInterface::CAPABILITY_PUBLIC) !== ResourceStorageInterface::CAPABILITY_PUBLIC) {
+        if (
+            ($resource->getStorage()->getCapabilities() & ResourceStorageInterface::CAPABILITY_PUBLIC)
+                !== ResourceStorageInterface::CAPABILITY_PUBLIC
+        ) {
+            return;
+        }
+
+        if (
+            $resource instanceof File &&
+            GeneralUtility::makeInstance(OnlineMediaHelperRegistry::class)->getOnlineMediaHelper($resource) !== false
+        ) {
             return;
         }