Changeset 40847

Timestamp:

05/26/2017 11:09:42 PM (7 years ago)

Author:

westonruter

Message:

Widgets: Normalize YouTube and Vimeo URLs in video shortcode (primarily for Video widget) to work around ME.js 2.22 bug.

Props timmydcrawford, jnylen0, westonruter.
See #32417, #39994.
Fixes #40866.

Location:

trunk

Files:

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

trunk/src/wp-includes/media.php

@@ -2547 +2547 @@
     }
 
+    // Mediaelement has issues with some URL formats for Vimeo and YouTube, so
+    // update the URL to prevent the ME.js player from breaking.
+    if ( 'mediaelement' === $library ) {
+        if ( $is_youtube ) {
+            // Remove `feature` query arg and force SSL - see #40866.
+            $atts['src'] = remove_query_arg( 'feature', $atts['src'] );
+            $atts['src'] = set_url_scheme( $atts['src'], 'https' );
+        } elseif ( $is_vimeo ) {
+            // Remove all query arguments and force SSL - see #40866.
+            $parsed_vimeo_url = wp_parse_url( $atts['src'] );
+            $atts['src'] = 'https://' . $parsed_vimeo_url['host'] . $parsed_vimeo_url['path'];
+        }
+    }
+
     /**
      * Filters the class attribute for the video shortcode output container.

trunk/tests/phpunit/tests/media.php

@@ -725 +725 @@
 
     /**
+     * @ticket 40866
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_youtube_remove_feature() {
+        $actual = wp_video_shortcode( array(
+            'src' => 'https://www.youtube.com/watch?v=i_cVJgIz_Cs&feature=youtu.be',
+        ) );
+
+        $this->assertNotContains( 'feature=youtu.be', $actual );
+    }
+
+    /**
+     * @ticket 40866
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_youtube_force_ssl() {
+        $actual = wp_video_shortcode( array(
+            'src' => 'http://www.youtube.com/watch?v=i_cVJgIz_Cs',
+        ) );
+
+        $this->assertContains( 'src="https://www.youtube.com/watch?v=i_cVJgIz_Cs', $actual );
+    }
+
+    /**
+     * @ticket 40866
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_vimeo_force_ssl_remove_query_args() {
+        $actual = wp_video_shortcode( array(
+            'src' => 'http://vimeo.com/190372437?blah=meh',
+        ) );
+
+        $this->assertContains( 'src="https://vimeo.com/190372437', $actual );
+        $this->assertNotContains( 'blah=meh', $actual );
+    }
+
+    /**
      * Test [video] shortcode processing
      *