[5.5] Fix custom URLs with prefix/root for AWS storage #22130
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a corner case of #22037 where the "path prefix" (or
root
) wasn't considered.The "path prefix" is prepended to the path in all other cases, see
path()
,getAwsUrl()
andgetAwsTemporaryUrl()
.Also, the temporary variable
$config
isn't necessary and was inlined.