WordPress 4.4

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

diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index 18c249031ba489e3d5003d13f061937ac79bfb99..e7f72c91e9c84283dbdff5dfff0018e4e96e123b 100644 (file)
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -33,47 +33,51 @@ class WP_oEmbed {
         * @since 2.9.0
         */
        public function __construct() {
         * @since 2.9.0
         */
        public function __construct() {

+               $host = urlencode( home_url() );

                $providers = array(
                $providers = array(

-                       '#http://((m|www)\.)?youtube\.com/watch.*#i'          => array( 'http://www.youtube.com/oembed',                      true  ),
-                       '#https://((m|www)\.)?youtube\.com/watch.*#i'         => array( 'http://www.youtube.com/oembed?scheme=https',         true  ),
-                       '#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array( 'http://www.youtube.com/oembed',                      true  ),
-                       '#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array( 'http://www.youtube.com/oembed?scheme=https',         true  ),
-                       '#http://youtu\.be/.*#i'                              => array( 'http://www.youtube.com/oembed',                      true  ),
-                       '#https://youtu\.be/.*#i'                             => array( 'http://www.youtube.com/oembed?scheme=https',         true  ),
-                       'http://blip.tv/*'                                    => array( 'http://blip.tv/oembed/',                             false ),
-                       '#https?://(.+\.)?vimeo\.com/.*#i'                    => array( 'http://vimeo.com/api/oembed.{format}',               true  ),
-                       '#https?://(www\.)?dailymotion\.com/.*#i'             => array( 'http://www.dailymotion.com/services/oembed',         true  ),
-                       'http://dai.ly/*'                                     => array( 'http://www.dailymotion.com/services/oembed',         false ),
-                       '#https?://(www\.)?flickr\.com/.*#i'                  => array( 'https://www.flickr.com/services/oembed/',            true  ),
-                       '#https?://flic\.kr/.*#i'                             => array( 'https://www.flickr.com/services/oembed/',            true  ),
-                       '#https?://(.+\.)?smugmug\.com/.*#i'                  => array( 'http://api.smugmug.com/services/oembed/',            true  ),
-                       '#https?://(www\.)?hulu\.com/watch/.*#i'              => array( 'http://www.hulu.com/api/oembed.{format}',            true  ),
-                       'http://i*.photobucket.com/albums/*'                  => array( 'http://photobucket.com/oembed',                      false ),
-                       'http://gi*.photobucket.com/groups/*'                 => array( 'http://photobucket.com/oembed',                      false ),
-                       '#https?://(www\.)?scribd\.com/doc/.*#i'              => array( 'http://www.scribd.com/services/oembed',              true  ),
-                       '#https?://wordpress.tv/.*#i'                         => array( 'http://wordpress.tv/oembed/',                        true  ),
-                       '#https?://(.+\.)?polldaddy\.com/.*#i'                => array( 'https://polldaddy.com/oembed/',                      true  ),
-                       '#https?://poll\.fm/.*#i'                             => array( 'https://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?://vine.co/v/.*#i'                            => array( 'https://vine.co/oembed.{format}',                    true  ),
-                       '#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?://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  ),
-                       '#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  ),
-                       '#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array( 'http://www.ted.com/talks/oembed.{format}',           true  ),
-                       '#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'http://animoto.com/oembeds/create',                  true  ),
-                       '#https?://(.+)\.tumblr\.com/post/.*#i'               => array( 'https://www.tumblr.com/oembed/1.0',                  true  ),
-                       '#https?://(www\.)?kickstarter\.com/projects/.*#i'    => array( 'https://www.kickstarter.com/services/oembed',        true  ),
-                       '#https?://kck\.st/.*#i'                              => array( 'https://www.kickstarter.com/services/oembed',        true  ),
-                       '#https?://cloudup\.com/.*#i'                         => array( 'https://cloudup.com/oembed', true ),
+                       '#http://((m|www)\.)?youtube\.com/watch.*#i'          => array( 'http://www.youtube.com/oembed',                             true  ),
+                       '#https://((m|www)\.)?youtube\.com/watch.*#i'         => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
+                       '#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array( 'http://www.youtube.com/oembed',                             true  ),
+                       '#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
+                       '#http://youtu\.be/.*#i'                              => array( 'http://www.youtube.com/oembed',                             true  ),
+                       '#https://youtu\.be/.*#i'                             => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
+                       '#https?://(.+\.)?vimeo\.com/.*#i'                    => array( 'http://vimeo.com/api/oembed.{format}',                      true  ),
+                       '#https?://(www\.)?dailymotion\.com/.*#i'             => array( 'https://www.dailymotion.com/services/oembed',               true  ),
+                       'http://dai.ly/*'                                     => array( 'https://www.dailymotion.com/services/oembed',               false ),
+                       '#https?://(www\.)?flickr\.com/.*#i'                  => array( 'https://www.flickr.com/services/oembed/',                   true  ),
+                       '#https?://flic\.kr/.*#i'                             => array( 'https://www.flickr.com/services/oembed/',                   true  ),
+                       '#https?://(.+\.)?smugmug\.com/.*#i'                  => array( 'http://api.smugmug.com/services/oembed/',                   true  ),
+                       '#https?://(www\.)?hulu\.com/watch/.*#i'              => array( 'http://www.hulu.com/api/oembed.{format}',                   true  ),
+                       'http://i*.photobucket.com/albums/*'                  => array( 'http://api.photobucket.com/oembed',                         false ),
+                       'http://gi*.photobucket.com/groups/*'                 => array( 'http://api.photobucket.com/oembed',                         false ),
+                       '#https?://(www\.)?scribd\.com/doc/.*#i'              => array( 'http://www.scribd.com/services/oembed',                     true  ),
+                       '#https?://wordpress.tv/.*#i'                         => array( 'http://wordpress.tv/oembed/',                               true  ),
+                       '#https?://(.+\.)?polldaddy\.com/.*#i'                => array( 'https://polldaddy.com/oembed/',                             true  ),
+                       '#https?://poll\.fm/.*#i'                             => array( 'https://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?://vine.co/v/.*#i'                            => array( 'https://vine.co/oembed.{format}',                           true  ),
+                       '#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  ),
+                       '#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  ),
+                       '#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array( 'http://www.ted.com/talks/oembed.{format}',                  true  ),
+                       '#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'https://animoto.com/oembeds/create',                        true  ),
+                       '#https?://(.+)\.tumblr\.com/post/.*#i'               => array( 'https://www.tumblr.com/oembed/1.0',                         true  ),
+                       '#https?://(www\.)?kickstarter\.com/projects/.*#i'    => array( 'https://www.kickstarter.com/services/oembed',               true  ),
+                       '#https?://kck\.st/.*#i'                              => array( 'https://www.kickstarter.com/services/oembed',               true  ),
+                       '#https?://cloudup\.com/.*#i'                         => array( 'https://cloudup.com/oembed',                                true  ),
+                       '#https?://(www\.)?reverbnation\.com/.*#i'            => array( 'https://www.reverbnation.com/oembed',                       true  ),
+                       '#https?://videopress.com/v/.*#'                      => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true  ),
+                       '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i' => array( 'https://www.reddit.com/oembed',                             true  ),
+                       '#https?://(www\.)?speakerdeck\.com/.*#i'             => array( 'https://speakerdeck.com/oembed.{format}',                   true  ),

                );
 
                if ( ! empty( self::$early_providers['add'] ) ) {
                );
 
                if ( ! empty( self::$early_providers['add'] ) ) {


@@ -91,48 +95,41 @@ class WP_oEmbed {
                self::$early_providers = array();
 
                /**
                self::$early_providers = array();
 
                /**

-                * Filter the list of oEmbed providers.
+                * Filter the list of whitelisted oEmbed providers.

                 *
                 *

-                * Discovery is disabled for users lacking the unfiltered_html capability.
-                * Only providers in this array will be used for those users.
+                * Since WordPress 4.4, oEmbed discovery is enabled for all users and allows embedding of sanitized
+                * iframes. The providers in this list are whitelisted, meaning they are trusted and allowed to
+                * embed any content, such as iframes, videos, JavaScript, and arbitrary HTML.

                 *
                 * Supported providers:
                 *
                 *
                 * Supported providers:
                 *

-                * | ------------ | -------------------- | ----- | --------- |
-                * |   Provider   |        Flavor        |  SSL  |   Since   |
-                * | ------------ | -------------------- | ----- | --------- |
-                * | Blip         | blip.tv              |   !   | 2.9.0     |
+                * |   Provider   |        Flavor        | HTTPS |   Since   |
+                * | ------------ | -------------------- | :---: | --------- |

                 * | Dailymotion  | dailymotion.com      |  Yes  | 2.9.0     |
                 * | Flickr       | flickr.com           |  Yes  | 2.9.0     |
                 * | Hulu         | hulu.com             |  Yes  | 2.9.0     |
                 * | Dailymotion  | dailymotion.com      |  Yes  | 2.9.0     |
                 * | Flickr       | flickr.com           |  Yes  | 2.9.0     |
                 * | Hulu         | hulu.com             |  Yes  | 2.9.0     |

-                * | Photobucket  | photobucket.com      |   !   | 2.9.0     |
+                * | Photobucket  | photobucket.com      |  No   | 2.9.0     |

                 * | Scribd       | scribd.com           |  Yes  | 2.9.0     |
                 * | Vimeo        | vimeo.com            |  Yes  | 2.9.0     |
                 * | WordPress.tv | wordpress.tv         |  Yes  | 2.9.0     |
                 * | YouTube      | youtube.com/watch    |  Yes  | 2.9.0     |
                 * | Scribd       | scribd.com           |  Yes  | 2.9.0     |
                 * | Vimeo        | vimeo.com            |  Yes  | 2.9.0     |
                 * | WordPress.tv | wordpress.tv         |  Yes  | 2.9.0     |
                 * | YouTube      | youtube.com/watch    |  Yes  | 2.9.0     |

-                * | ------------ | -------------------- | ----- | --------- |

                 * | Funny or Die | funnyordie.com       |  Yes  | 3.0.0     |
                 * | Polldaddy    | polldaddy.com        |  Yes  | 3.0.0     |
                 * | SmugMug      | smugmug.com          |  Yes  | 3.0.0     |
                 * | YouTube      | youtu.be             |  Yes  | 3.0.0     |
                 * | Funny or Die | funnyordie.com       |  Yes  | 3.0.0     |
                 * | Polldaddy    | polldaddy.com        |  Yes  | 3.0.0     |
                 * | SmugMug      | smugmug.com          |  Yes  | 3.0.0     |
                 * | YouTube      | youtu.be             |  Yes  | 3.0.0     |

-                * | ------------ | -------------------- | ----- | --------- |

                 * | Twitter      | twitter.com          |  Yes  | 3.4.0     |
                 * | Twitter      | twitter.com          |  Yes  | 3.4.0     |

-                * | ------------ | -------------------- | ----- | --------- |

                 * | Instagram    | instagram.com        |  Yes  | 3.5.0     |
                 * | Instagram    | instagr.am           |  Yes  | 3.5.0     |
                 * | Slideshare   | slideshare.net       |  Yes  | 3.5.0     |
                 * | SoundCloud   | soundcloud.com       |  Yes  | 3.5.0     |
                 * | Instagram    | instagram.com        |  Yes  | 3.5.0     |
                 * | Instagram    | instagr.am           |  Yes  | 3.5.0     |
                 * | Slideshare   | slideshare.net       |  Yes  | 3.5.0     |
                 * | SoundCloud   | soundcloud.com       |  Yes  | 3.5.0     |

-                * | ------------ | -------------------- | ----- | --------- |
-                * | Dailymotion  | dai.ly               |   !   | 3.6.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     |
                 * | 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     |
                 * | Meetup.com   | meetu.ps             |  Yes  | 3.9.0     |
                 * | Imgur        | imgur.com            |  Yes  | 3.9.0     |
                 * | Meetup.com   | meetup.com           |  Yes  | 3.9.0     |
                 * | Meetup.com   | meetu.ps             |  Yes  | 3.9.0     |

-                * | ------------ | -------------------- | ----- | --------- |

                 * | Animoto      | animoto.com          |  Yes  | 4.0.0     |
                 * | Animoto      | video214.com         |  Yes  | 4.0.0     |
                 * | CollegeHumor | collegehumor.com     |  Yes  | 4.0.0     |
                 * | Animoto      | animoto.com          |  Yes  | 4.0.0     |
                 * | Animoto      | video214.com         |  Yes  | 4.0.0     |
                 * | CollegeHumor | collegehumor.com     |  Yes  | 4.0.0     |


@@ -141,25 +138,24 @@ class WP_oEmbed {
                 * | Polldaddy    | poll.fm              |  Yes  | 4.0.0     |
                 * | TED          | ted.com              |  Yes  | 4.0.0     |
                 * | YouTube      | youtube.com/playlist |  Yes  | 4.0.0     |
                 * | Polldaddy    | poll.fm              |  Yes  | 4.0.0     |
                 * | TED          | ted.com              |  Yes  | 4.0.0     |
                 * | YouTube      | youtube.com/playlist |  Yes  | 4.0.0     |

-                * | ------------ | -------------------- | ----- | --------- |

                 * | Vine         | vine.co              |  Yes  | 4.1.0     |
                 * | Vine         | vine.co              |  Yes  | 4.1.0     |

-                * | ------------ | -------------------- | ----- | --------- |

                 * | Tumblr       | tumblr.com           |  Yes  | 4.2.0     |
                 * | Kickstarter  | kickstarter.com      |  Yes  | 4.2.0     |
                 * | Kickstarter  | kck.st               |  Yes  | 4.2.0     |
                 * | Tumblr       | tumblr.com           |  Yes  | 4.2.0     |
                 * | Kickstarter  | kickstarter.com      |  Yes  | 4.2.0     |
                 * | Kickstarter  | kck.st               |  Yes  | 4.2.0     |

-                * | ------------ | -------------------- | ----- | --------- |
+                * | Cloudup      | cloudup.com          |  Yes  | 4.4.0     |
+                * | ReverbNation | reverbnation.com     |  Yes  | 4.4.0     |
+                * | VideoPress   | videopress.com       |  Yes  | 4.4.0     |
+                * | Reddit       | reddit.com           |  Yes  | 4.4.0     |
+                * | Speaker Deck | speakerdeck.com      |  Yes  | 4.4.0     |

                 *
                 * No longer supported providers:
                 *
                 *
                 * No longer supported providers:
                 *

-                * | ------------ | -------------------- | ----- | --------- | --------- |
-                * |   Provider   |        Flavor        |  SSL  |   Since   |  Removed  |
-                * | ------------ | -------------------- | ----- | --------- | --------- |
+                * |   Provider   |        Flavor        | HTTPS |   Since   |  Removed  |
+                * | ------------ | -------------------- | :---: | --------- | --------- |

                 * | Qik          | qik.com              |  Yes  | 2.9.0     | 3.9.0     |
                 * | Qik          | qik.com              |  Yes  | 2.9.0     | 3.9.0     |

-                * | ------------ | -------------------- | ----- | --------- | --------- |

                 * | Viddler      | viddler.com          |  Yes  | 2.9.0     | 4.0.0     |
                 * | Viddler      | viddler.com          |  Yes  | 2.9.0     | 4.0.0     |

-                * | ------------ | -------------------- | ----- | --------- | --------- |
-                * | Revision3    | revision3.com        |   !   | 2.9.0     | 4.2.0     |
-                * | ------------ | -------------------- | ----- | --------- | --------- |
+                * | Revision3    | revision3.com        |  No   | 2.9.0     | 4.2.0     |
+                * | Blip         | blip.tv              |  No   | 2.9.0     | 4.4.0     |

                 *
                 * @see wp_oembed_add_provider()
                 *
                 *
                 * @see wp_oembed_add_provider()
                 *


@@ -409,7 +405,7 @@ class WP_oEmbed {
                 */
                $provider = apply_filters( 'oembed_fetch_url', $provider, $url, $args );
 
                 */
                $provider = apply_filters( 'oembed_fetch_url', $provider, $url, $args );
 

-               foreach( array( 'json', 'xml' ) as $format ) {
+               foreach ( array( 'json', 'xml' ) as $format ) {

                        $result = $this->_fetch_with_format( $provider, $format );
                        if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
                                continue;
                        $result = $this->_fetch_with_format( $provider, $format );
                        if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
                                continue;


@@ -490,7 +486,7 @@ class WP_oEmbed {
         * @return object|false
         */
        private function _parse_xml_body( $response_body ) {
         * @return object|false
         */
        private function _parse_xml_body( $response_body ) {

-               if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument' ) )
+               if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) )

                        return false;
 
                $dom = new DOMDocument;
                        return false;
 
                $dom = new DOMDocument;