Changeset 41054 for branches/4.8

Timestamp:

07/14/2017 05:33:44 PM (7 years ago)

Author:

westonruter

Message:

Media: Restrict appending loop parameter to Vimeo URLs specifically and not all external URLs in Video widget (via shortcode).

Fixes issue where Video widgets embedding external files fail to get recognized due to the presence of the loop param after the video filename, even though it has a recognized extension. Regardless, the loop param is only present to fix a Vimeo issue in ME.js 2.x.

Merges [40892] into the 4.8 branch.
Props timmydcrawford.
Amends [40640].
See #39686, #39994.
Fixes #40977 for 4.8.1.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• src/wp-includes/media.php (modified) (1 diff)
• src/wp-includes/widgets/class-wp-widget-media-video.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

branches/4.8/src/wp-includes/media.php

@@ -2557 +2557 @@
             // 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'];
+            $vimeo_src = 'https://' . $parsed_vimeo_url['host'] . $parsed_vimeo_url['path'];
+
+            // Add loop param for mejs bug - see #40977, not needed after #39686.
+            $loop = $atts['loop'] ? '1' : '0';
+            $atts['src'] = add_query_arg( 'loop', $loop, $vimeo_src );
         }
     }

branches/4.8/src/wp-includes/widgets/class-wp-widget-media-video.php

@@ -116 +116 @@
         }
 
+        $src = $instance['url'];
         if ( $attachment ) {
             $src = wp_get_attachment_url( $attachment->ID );
-        } else {
-
-            // Manually add the loop query argument.
-            $loop = $instance['loop'] ? '1' : '0';
-            $src = empty( $instance['url'] ) ? $instance['url'] : add_query_arg( 'loop', $loop, $instance['url'] );
         }
 

branches/4.8/tests/phpunit/tests/media.php

@@ -762 +762 @@
 
     /**
+     * @ticket 40977
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_vimeo_adds_loop() {
+        $actual = wp_video_shortcode( array(
+            'src' => 'http://vimeo.com/190372437',
+        ) );
+
+        $this->assertContains( 'src="https://vimeo.com/190372437?loop=0', $actual );
+    }
+
+    /**
+     * @ticket 40977
+     * @depends test_video_shortcode_body
+     */
+    function test_wp_video_shortcode_vimeo_force_adds_loop_true() {
+        $actual = wp_video_shortcode( array(
+            'src' => 'http://vimeo.com/190372437',
+            'loop' => true,
+        ) );
+
+        $this->assertContains( 'src="https://vimeo.com/190372437?loop=1', $actual );
+    }
+
+    /**
      * Test [video] shortcode processing
      *