← Back to branch summary

~canonical-sysadmins/wordpress/4.4.2

« back to all changes in this revision

Viewing changes to wp-includes/class-oembed.php

  • Committer: Barry Price
  • Date: 2016-01-07 06:09:42 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: barry.price@canonical.com-20160107060942-1ghv2tqiwm8z0j36
Merge WP4.4.1 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/class-oembed.php
60
60
                        '#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'http://soundcloud.com/oembed',                              true  ),
61
61
                        '#https?://(.+?\.)?slideshare\.net/.*#i'              => array( 'https://www.slideshare.net/api/oembed/2',                   true  ),
62
62
                        '#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i'      => array( 'https://api.instagram.com/oembed',                          true  ),
63
 
                        '#https?://(www\.)?rdio\.com/.*#i'                    => array( 'http://www.rdio.com/api/oembed/',                           true  ),
64
 
                        '#https?://rd\.io/x/.*#i'                             => array( 'http://www.rdio.com/api/oembed/',                           true  ),
65
63
                        '#https?://(open|play)\.spotify\.com/.*#i'            => array( 'https://embed.spotify.com/oembed/',                         true  ),
66
64
                        '#https?://(.+\.)?imgur\.com/.*#i'                    => array( 'http://api.imgur.com/oembed',                               true  ),
67
65
                        '#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'           => array( 'http://api.meetup.com/oembed',                              true  ),
124
122
                 * | SoundCloud   | soundcloud.com       |  Yes  | 3.5.0     |
125
123
                 * | Dailymotion  | dai.ly               |  No   | 3.6.0     |
126
124
                 * | Flickr       | flic.kr              |  Yes  | 3.6.0     |
127
 
                 * | Rdio         | rdio.com             |  Yes  | 3.6.0     |
128
 
                 * | Rdio         | rd.io                |  Yes  | 3.6.0     |
129
125
                 * | Spotify      | spotify.com          |  Yes  | 3.6.0     |
130
126
                 * | Imgur        | imgur.com            |  Yes  | 3.9.0     |
131
127
                 * | Meetup.com   | meetup.com           |  Yes  | 3.9.0     |
156
152
                 * | Viddler      | viddler.com          |  Yes  | 2.9.0     | 4.0.0     |
157
153
                 * | Revision3    | revision3.com        |  No   | 2.9.0     | 4.2.0     |
158
154
                 * | Blip         | blip.tv              |  No   | 2.9.0     | 4.4.0     |
 
155
                 * | Rdio         | rdio.com             |  Yes  | 3.6.0     | 4.4.1     |
 
156
                 * | Rdio         | rd.io                |  Yes  | 3.6.0     | 4.4.1     |
159
157
                 *
160
158
                 * @see wp_oembed_add_provider()
161
159
                 *