Ticket #40866: 40866.4.diff

src/wp-includes/media.php

@@ -2546 +2546 @@
                 wp_enqueue_script( 'wp-mediaelement' );
         }
 
+        // 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.
          *

tests/phpunit/tests/media.php

@@ -724 +724 @@
         }
 
         /**
+         * @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
          *
          */