Changeset 32930

Timestamp:

06/24/2015 09:05:59 PM (7 years ago)

Author:

wonderboymusic

Message:

YouTube oEmbed parsing: support the m subdomain.
Adds unit tests.

Props Toru, johnbillion.
Fixes #32714.

Location:

trunk

Files:

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

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

@@ -35 +35 @@
     public function __construct() {
         $providers = array(
-            '#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://(www\.)?youtube\.com/playlist.*#i'           => array( 'http://www.youtube.com/oembed',                      true  ),
-            '#https://(www\.)?youtube\.com/playlist.*#i'          => array( 'http://www.youtube.com/oembed?scheme=https',         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  ),

trunk/tests/phpunit/tests/media.php

@@ -129 +129 @@
         $out = wp_oembed_get( 'https://youtu.be/zHjMoNQN7s0' );
         $this->assertContains( 'https://www.youtube.com/embed/zHjMoNQN7s0?feature=oembed', $out );
+    }
+
+    /**
+     * Test m.youtube.com embeds
+     *
+     * @ticket 32714
+     */
+    function test_youtube_com_mobile_embed() {
+        $out = wp_oembed_get( 'http://m.youtube.com/watch?v=oHg5SJYRHA0' );
+        $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out );
+
+        $out = wp_oembed_get( 'https://m.youtube.com/watch?v=oHg5SJYRHA0' );
+        $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out );
     }