diff --git a/Classes/Domain/Service/StyleAndJavascriptInclusionService.php b/Classes/Domain/Service/StyleAndJavascriptInclusionService.php
index 8cd241d83e..da787a4414 100644
--- a/Classes/Domain/Service/StyleAndJavascriptInclusionService.php
+++ b/Classes/Domain/Service/StyleAndJavascriptInclusionService.php
@@ -99,7 +99,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 = $element['attributes'] ?? [];
// All scripts are deferred by default. This prevents the attribute from
@@ -107,7 +107,6 @@ protected function build(array $resourceArrayToSort, \Closure $builderForLine):
if (isset($additionalAttributes['defer'])) {
unset($additionalAttributes['defer']);
}
-
$result .= $builderForLine($finalUri, $this->htmlAttributesArrayToString($additionalAttributes));
}
return $result;
diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf
index 29f22bbcf3..112f57df44 100644
--- a/Resources/Private/Translations/en/Main.xlf
+++ b/Resources/Private/Translations/en/Main.xlf
@@ -394,6 +394,9 @@
+
+
+