From a60b602ade955c8ce620facae160ffabd7893d4b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 21 Nov 2019 19:03:07 +0100
Subject: [PATCH] Fix OEmbed discovery not handling different URL variants in
query (#12439)
Fix #12433
---
app/services/fetch_oembed_service.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb
index 4f8498c623..76d971bc51 100644
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -58,7 +58,7 @@ class FetchOEmbedService
url_domain = Addressable::URI.parse(@url).normalized_host
endpoint_hash = {
- endpoint: @endpoint_url.gsub(URI.encode_www_form_component(@url), '{url}'),
+ endpoint: @endpoint_url.gsub(/(=(http[s]?(%3A|:)(\/\/|%2F%2F)))([^&]*)/i, '={url}'),
format: @format,
}