Merge pull request #3753 from neos/bugfix/cache-buster-fix

neos · Mar 17, 2024 · 102cd7c · 102cd7c
2 parents d0d8518 + deeefb3
commit 102cd7c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Classes/Domain/Service/StyleAndJavascriptInclusionService.php b/Classes/Domain/Service/StyleAndJavascriptInclusionService.php
@@ -95,7 +95,7 @@ protected function build(array $resourceArrayToSort, \Closure $builderForLine)
                 $hash = substr(md5_file($resourceExpression), 0, 8);
                 $resourceExpression = $this->resourceManager->getPublicPackageResourceUriByPath($resourceExpression);
             }
-            $finalUri = $hash ? $resourceExpression . '?' . $hash : $resourceExpression;
+            $finalUri = $hash ? $resourceExpression . (str_contains($resourceExpression, '?') ? '&' : '?') . $hash : $resourceExpression;
             $additionalAttributes = array_merge(
                 // legacy first level 'defer' attribute
                 isset($element['defer']) ? ['defer' => $element['defer']] : [],