Changeset 26978

Timestamp:

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

Author:

nacin

Message:

Ensure that SSL YouTube URLs receive SSL embeds.

props adamsilverstein, Otto42, JayCC.
fixes #23149.

Location:

trunk

Files:

• src/wp-includes/class-oembed.php (modified) (2 diffs)
• tests/phpunit/tests/media.php (modified) (1 diff)

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.

trunk/tests/phpunit/tests/media.php

@@ -113 +113 @@
                 $this->assertTrue( wp_oembed_remove_provider( 'http://foo.bar/*' ) );
                 $this->assertFalse( wp_oembed_remove_provider( 'http://foo.bar/*' ) );
+        }
+
+        /**
+         * Test secure youtube.com embeds
+         *
+         * @ticket 23149
+         */
+        function test_youtube_com_secure_embed() {
+                global $wp_embed;
+
+                $out = wp_oembed_get( 'http://www.youtube.com/watch?v=oHg5SJYRHA0' );
+                $this->assertContains( 'http://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out );
+
+                $out = wp_oembed_get( 'https://www.youtube.com/watch?v=oHg5SJYRHA0' );
+                $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out );
+
+                $out = wp_oembed_get( 'https://youtu.be/zHjMoNQN7s0' );
+                $this->assertContains( 'https://www.youtube.com/embed/zHjMoNQN7s0?feature=oembed', $out );
         }