diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-11 20:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 20:09:00 +0200 |
| commit | 82b521b4c306d75530795bce9f6c706359e7339e (patch) | |
| tree | 4ac730d5c48dfd27703e33ffab034e3266f7e0ad /app/services/fetch_oembed_service.rb | |
| parent | 59de2868c13a61bce08923f841024fefebe3b3da (diff) | |
| parent | f1214f00d990612229c753d8657944a10b9bf8a1 (diff) | |
Merge pull request #724 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/fetch_oembed_service.rb')
| -rw-r--r-- | app/services/fetch_oembed_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb index 998228517..9ddf9b13b 100644 --- a/app/services/fetch_oembed_service.rb +++ b/app/services/fetch_oembed_service.rb @@ -31,7 +31,7 @@ class FetchOEmbedService return if @endpoint_url.blank? - @endpoint_url = Addressable::URI.parse(@endpoint_url).to_s + @endpoint_url = (Addressable::URI.parse(@url) + @endpoint_url).to_s rescue Addressable::URI::InvalidURIError @endpoint_url = nil end |