Merge pull request #847 from humanmade/backport-841-to-v18-branch

[Backport v18-branch] URL encode filenames in CDN Media Purge
humanmade · Feb 8, 2024 · 0f215ff · 0f215ff
2 parents 5993cfc + 16dfab5
commit 0f215ff
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/inc/cloudfront_media_purge/namespace.php b/inc/cloudfront_media_purge/namespace.php
@@ -31,7 +31,8 @@ function purge_media_file_cache( int $media_id ) {
 	$upload_path      = wp_parse_url( $upload_url, PHP_URL_PATH );
 	$upload_path_info = pathinfo( $upload_path );
 	$items            = [];
-	$items[]          = $upload_path_info['dirname'] . '/' . $upload_path_info['filename'] . '*';
+	// Make sure the image filename is URL encoded, else CloudFront will not be able to purge it.
+	$items[] = $upload_path_info['dirname'] . '/' . urlencode( $upload_path_info['filename'] ) . '*';
 	if ( function_exists( 'tachyon_url' ) ) {
 		$tachyon_url       = tachyon_url( $upload_url );
 		$tachyon_path      = wp_parse_url( $tachyon_url, PHP_URL_PATH );