WordPress 4.4.1

[autoinstalls/wordpress.git] / wp-includes / class-oembed.php

diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index e7f72c91e9c84283dbdff5dfff0018e4e96e123b..b60a4f4794abfc5720df1d879a17ff1e8fc482be 100644 (file)
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -60,8 +60,6 @@ class WP_oEmbed {
                        '#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'http://soundcloud.com/oembed',                              true  ),
                        '#https?://(.+?\.)?slideshare\.net/.*#i'              => array( 'https://www.slideshare.net/api/oembed/2',                   true  ),
                        '#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i'      => array( 'https://api.instagram.com/oembed',                          true  ),
-                       '#https?://(www\.)?rdio\.com/.*#i'                    => array( 'http://www.rdio.com/api/oembed/',                           true  ),
-                       '#https?://rd\.io/x/.*#i'                             => array( 'http://www.rdio.com/api/oembed/',                           true  ),
                        '#https?://(open|play)\.spotify\.com/.*#i'            => array( 'https://embed.spotify.com/oembed/',                         true  ),
                        '#https?://(.+\.)?imgur\.com/.*#i'                    => array( 'http://api.imgur.com/oembed',                               true  ),
                        '#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'           => array( 'http://api.meetup.com/oembed',                              true  ),
@@ -124,8 +122,6 @@ class WP_oEmbed {
                 * | SoundCloud   | soundcloud.com       |  Yes  | 3.5.0     |
                 * | Dailymotion  | dai.ly               |  No   | 3.6.0     |
                 * | Flickr       | flic.kr              |  Yes  | 3.6.0     |
-                * | Rdio         | rdio.com             |  Yes  | 3.6.0     |
-                * | Rdio         | rd.io                |  Yes  | 3.6.0     |
                 * | Spotify      | spotify.com          |  Yes  | 3.6.0     |
                 * | Imgur        | imgur.com            |  Yes  | 3.9.0     |
                 * | Meetup.com   | meetup.com           |  Yes  | 3.9.0     |
@@ -156,6 +152,8 @@ class WP_oEmbed {
                 * | Viddler      | viddler.com          |  Yes  | 2.9.0     | 4.0.0     |
                 * | Revision3    | revision3.com        |  No   | 2.9.0     | 4.2.0     |
                 * | Blip         | blip.tv              |  No   | 2.9.0     | 4.4.0     |
+                * | Rdio         | rdio.com             |  Yes  | 3.6.0     | 4.4.1     |
+                * | Rdio         | rd.io                |  Yes  | 3.6.0     | 4.4.1     |
                 *
                 * @see wp_oembed_add_provider()
                 *