Ticket #28372: 28372.diff

src/wp-includes/class-oembed.php

@@ -21 +21 @@
         public $providers = array();
 
         /**
-         * Constructor
-         *
-         * @uses apply_filters() Filters a list of pre-defined oEmbed providers.
+         * Constructor.
          */
         public function __construct() {
-                $providers = array(
+                /**
+                 * Filter the list of oEmbed providers.
+                 *
+                 * Discovery is disabled for users lacking the unfiltered_html capability.
+                 * Only providers in this array will be used for those users.
+                 *
+                 * Supported providers:
+                 *
+                 * | Provider     | Flavor           | Since              |
+                 * | ------------ | ---------------- | ------------------ |
+                 * | Blip         | blip.tv          | 2.9.0              |
+                 * | CollegeHumor | collegehumor.com | 4.0.0              |
+                 * | Dailymotion  | dailymotion.com  | 2.9.0              |
+                 * | Dailymotion  | dai.ly           | 3.6.0              |
+                 * | Flickr       | flickr.com       | 2.9.0              |
+                 * | Flickr       | flic.kr          | 3.6.0              |
+                 * | Funny or Die | funnyordie.com   | 3.0.0              |
+                 * | Hulu         | hulu.com         | 2.9.0              |
+                 * | Imgur        | imgur.com        | 3.9.0              |
+                 * | Issuu        | issuu.com        | 4.0.0              |
+                 * | Instagram    | instagram.com    | 3.5.0              |
+                 * | Instagram    | instagr.am       | 3.5.0              |
+                 * | Meetup.com   | meetup.com       | 3.9.0              |
+                 * | Meetup.com   | meetu.ps         | 3.9.0              |
+                 * | Mixcloud     | mixcloud.com     | 4.0.0              |
+                 * | Photobucket  | photobucket.com  | 2.9.0              |
+                 * | Polldaddy    | polldaddy.com    | 3.0.0              |
+                 * | Polldaddy    | poll.fm          | 4.0.0              |
+                 * | Qik          | qik.com          | 2.9.0 (deprecated) |
+                 * | Rdio         | rdio.com         | 3.6.0              |
+                 * | Rdio         | rd.io            | 3.6.0              |
+                 * | Revision3    | revision3.com    | 2.9.0              |
+                 * | Scribd       | scribd.com       | 2.9.0              |
+                 * | Slideshare   | slideshare.net   | 3.5.0              |
+                 * | SoundCloud   | soundcloud.com   | 3.5.0              |
+                 * | Spotify      | spotify.com      | 3.6.0              |
+                 * | Twitter      | twitter.com      | 3.4.0              |
+                 * | Viddler      | viddler.com      | 2.9.0              |
+                 * | Vimeo        | vimeo.com        | 2.9.0              |
+                 * | WordPress.tv | wordpress.tv     | 2.9.0              |
+                 * | YouTube      | youtube.com      | 2.9.0              |
+                 * | YouTube      | youtu.be         | 3.0.0              |
+                 *
+                 * @see wp_oembed_add_provider()
+                 *
+                 * @since 2.9.0
+                 *
+                 * @param array $providers An array of popular oEmbed providers.
+                 */
+                $this->providers = apply_filters( 'oembed_providers', array(
                         '#http://(www\.)?youtube\.com/(watch|playlist).*#i'   => array( 'http://www.youtube.com/oembed',                      true  ),
                         '#https://(www\.)?youtube\.com/(watch|playlist).*#i'  => array( 'http://www.youtube.com/oembed?scheme=https',         true  ),
                         '#http://youtu\.be/.*#i'                              => array( 'http://www.youtube.com/oembed',                      true  ),
@@ -49 +96 @@
                         '#https?://poll\.fm/.*#i'                             => array( 'http://polldaddy.com/oembed/',                       true  ),
                         '#https?://(www\.)?funnyordie\.com/videos/.*#i'       => array( 'http://www.funnyordie.com/oembed',                   true  ),
                         '#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://api.twitter.com/1/statuses/oembed.{format}', true  ),
-                        '#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'http://soundcloud.com/oembed',                       true  ),
+                        '#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'http://soundcloud.com/oembed',                       true  ),
                         '#https?://(www\.)?slideshare\.net/*#'                => array( 'http://www.slideshare.net/api/oembed/2',             true  ),
                         '#http://instagr(\.am|am\.com)/p/.*#i'                => array( 'http://api.instagram.com/oembed',                    true  ),
                         '#https?://(www\.)?rdio\.com/.*#i'                    => array( 'http://www.rdio.com/api/oembed/',                    true  ),
@@ -60 +107 @@
                         '#https?://(www\.)?issuu\.com/.+/docs/.+#i'           => array( 'http://issuu.com/oembed_wp',                         true  ),
                         '#https?://(www\.)?collegehumor\.com/video/.*#i'      => array( 'http://www.collegehumor.com/oembed.{format}',        true  ),
                         '#https?://(www\.)?mixcloud\.com/.*#i'                => array( 'http://www.mixcloud.com/oembed',                     true  ),
-                );
+                ) );
 
-                /**
-                 * Filter the list of oEmbed providers.
-                 *
-                 * Discovery is disabled for users lacking the unfiltered_html capability.
-                 * Only providers in this array will be used for those users.
-                 *
-                 * @see wp_oembed_add_provider()
-                 *
-                 * @since 2.9.0
-                 *
-                 * @param array $providers An array of popular oEmbed providers.
-                 */
-                $this->providers = apply_filters( 'oembed_providers', $providers );
-
                 // Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
                 add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
         }