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

Sebobo · web-flow · commit 102cd7c3132f · 2024-03-17T14:01:02.000+01:00
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']] : [],

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected function build(array $resourceArrayToSort, \Closure $builderForLine)`
`95`	`95`	`$hash = substr(md5_file($resourceExpression), 0, 8);`
`96`	`96`	`$resourceExpression = $this->resourceManager->getPublicPackageResourceUriByPath($resourceExpression);`
`97`	`97`	`}`
`98`		`- $finalUri = $hash ? $resourceExpression . '?' . $hash : $resourceExpression;`
	`98`	`+ $finalUri = $hash ? $resourceExpression . (str_contains($resourceExpression, '?') ? '&' : '?') . $hash : $resourceExpression;`
`99`	`99`	`$additionalAttributes = array_merge(`
`100`	`100`	`// legacy first level 'defer' attribute`
`101`	`101`	`isset($element['defer']) ? ['defer' => $element['defer']] : [],`