diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
| commit | 7174d1c955116e142754189e6169d9b31b599070 (patch) | |
| tree | 49139e81fc3cff355950401207968dca0944acd0 /app/lib | |
| parent | 7347bc733418651216f22f224caf656471499a08 (diff) | |
| parent | 65f30f65a2816d5b25c096be0f237bbca17608e5 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/provider_discovery.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/provider_discovery.rb b/app/lib/provider_discovery.rb index 04ba38101..5732e4fcb 100644 --- a/app/lib/provider_discovery.rb +++ b/app/lib/provider_discovery.rb @@ -29,7 +29,7 @@ class ProviderDiscovery < OEmbed::ProviderDiscovery end if format.nil? || format == :xml - provider_endpoint ||= html.at_xpath('//link[@type="application/xml+oembed"]')&.attribute('href')&.value + provider_endpoint ||= html.at_xpath('//link[@type="text/xml+oembed"]')&.attribute('href')&.value format ||= :xml if provider_endpoint end |