Changeset 26978 for trunk/src/wp-includes/class-oembed.php

Timestamp:

01/17/2014 07:45:51 PM (11 years ago)

Author:

nacin

Message:

Ensure that SSL YouTube URLs receive SSL embeds.

props adamsilverstein, Otto42, JayCC.
fixes #23149.

File:

• trunk/src/wp-includes/class-oembed.php (modified) (2 diffs)

trunk/src/wp-includes/class-oembed.php

@@ -28 +28 @@
     function __construct() {
         $providers = array(
-            '#https?://(www\.)?youtube\.com/watch.*#i'            => array( 'http://www.youtube.com/oembed',                      true  ),
-            'http://youtu.be/*'                                   => array( 'http://www.youtube.com/oembed',                      false ),
+            '#http://(www\.)?youtube\.com/watch.*#i'              => array( 'http://www.youtube.com/oembed',                      true  ),
+            '#https://(www\.)?youtube\.com/watch.*#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?://(www\.)?vimeo\.com/.*#i'                   => array( 'http://vimeo.com/api/oembed.{format}',               true  ),
@@ -55 +57 @@
             '#https?://(open|play)\.spotify\.com/.*#i'            => array( 'https://embed.spotify.com/oembed/',                  true  ),
         );
+
         /**
          * Filter the list of oEmbed providers.