sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Props timmydcrawford.
Amends [40640].
See #39686, #39994.
Fixes #40977.


git-svn-id: https://develop.svn.wordpress.org/trunk@40892 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter 2017-06-09 19:28:12 +00:00
parent 774e82b540
commit d3226f6041
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/media.php
View File

@ -2556,7 +2556,11 @@ function wp_video_shortcode( $attr, $content = '' ) {
} 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'];
$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 );
}
}

6
src/wp-includes/widgets/class-wp-widget-media-video.php
View File

@ -115,13 +115,9 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
$attachment = get_post( $instance['attachment_id'] );
}
$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'] );
}
if ( empty( $src ) ) {

25
tests/phpunit/tests/media.php
View File

@ -760,6 +760,31 @@ VIDEO;
$this->assertNotContains( 'blah=meh', $actual );
}
/**
* @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
*