<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[41054] branches/4.8: Media: Restrict appending `loop` parameter to Vimeo URLs specifically and not all external URLs in Video widget (via shortcode).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41054">41054</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41054","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-07-14 17:33:44 +0000 (Fri, 14 Jul 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/changeset/40892">[40892]</a> into the 4.8 branch.
Props timmydcrawford.
Amends <a href="https://core.trac.wordpress.org/changeset/40640">[40640]</a>.
See <a href="https://core.trac.wordpress.org/ticket/39686">#39686</a>, <a href="https://core.trac.wordpress.org/ticket/39994">#39994</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/40977">#40977</a> for 4.8.1.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches48srcwpincludesmediaphp">branches/4.8/src/wp-includes/media.php</a></li>
<li><a href="#branches48srcwpincludeswidgetsclasswpwidgetmediavideophp">branches/4.8/src/wp-includes/widgets/class-wp-widget-media-video.php</a></li>
<li><a href="#branches48testsphpunittestsmediaphp">branches/4.8/tests/phpunit/tests/media.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches48">branches/4.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.8
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.8 2017-07-14 17:27:33 UTC (rev 41053)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.8 2017-07-14 17:33:44 UTC (rev 41054)
</ins><a id="branches48"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,40872-40873,40879,40881,40883,40885,40893,40897,40901,40926,40941,41000,41009,41022,41028,41035,41037,41047,41050
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,40872-40873,40879,40881,40883,40885,40892-40893,40897,40901,40926,40941,41000,41009,41022,41028,41035,41037,41047,41050
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches48srcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-includes/media.php 2017-07-14 17:27:33 UTC (rev 41053)
+++ branches/4.8/src/wp-includes/media.php 2017-07-14 17:33:44 UTC (rev 41054)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2556,7 +2556,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_vimeo ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove all query arguments and force SSL - see #40866.
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_vimeo_url = wp_parse_url( $atts['src'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $atts['src'] = 'https://' . $parsed_vimeo_url['host'] . $parsed_vimeo_url['path'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches48srcwpincludeswidgetsclasswpwidgetmediavideophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-includes/widgets/class-wp-widget-media-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-includes/widgets/class-wp-widget-media-video.php 2017-07-14 17:27:33 UTC (rev 41053)
+++ branches/4.8/src/wp-includes/widgets/class-wp-widget-media-video.php 2017-07-14 17:33:44 UTC (rev 41054)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,13 +115,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment = get_post( $instance['attachment_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $src = $instance['url'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $attachment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $src = wp_get_attachment_url( $attachment->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } 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'] );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $src ) ) {
</span></span></pre></div>
<a id="branches48testsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/tests/phpunit/tests/media.php 2017-07-14 17:27:33 UTC (rev 41053)
+++ branches/4.8/tests/phpunit/tests/media.php 2017-07-14 17:33:44 UTC (rev 41054)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,6 +761,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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 );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test [video] shortcode processing
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>