<!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>[26978] trunk: Ensure that SSL YouTube URLs receive SSL embeds.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26978">26978</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-17 19:45:51 +0000 (Fri, 17 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that SSL YouTube URLs receive SSL embeds.
props adamsilverstein, Otto42, JayCC.
fixes <a href="http://core.trac.wordpress.org/ticket/23149">#23149</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclassoembedphp">trunk/src/wp-includes/class-oembed.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-oembed.php (26977 => 26978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-oembed.php 2014-01-17 18:14:15 UTC (rev 26977)
+++ trunk/src/wp-includes/class-oembed.php 2014-01-17 19:45:51 UTC (rev 26978)
</span><span class="lines">@@ -27,8 +27,10 @@
</span><span class="cx"> */
</span><span class="cx"> function __construct() {
</span><span class="cx"> $providers = array(
</span><del>- '#https?://(www\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed', true ),
- 'http://youtu.be/*' => array( 'http://www.youtube.com/oembed', false ),
</del><ins>+ '#http://(www\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed', true ),
+ '#https://(www\.)?youtube\.com/watch.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ),
+ '#http://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed', true ),
+ '#https://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ),
</ins><span class="cx"> 'http://blip.tv/*' => array( 'http://blip.tv/oembed/', false ),
</span><span class="cx"> '#https?://(www\.)?vimeo\.com/.*#i' => array( 'http://vimeo.com/api/oembed.{format}', true ),
</span><span class="cx"> '#https?://(www\.)?dailymotion\.com/.*#i' => array( 'http://www.dailymotion.com/services/oembed', true ),
</span><span class="lines">@@ -54,6 +56,7 @@
</span><span class="cx"> '#https?://rd\.io/x/.*#i' => array( 'http://www.rdio.com/api/oembed/', true ),
</span><span class="cx"> '#https?://(open|play)\.spotify\.com/.*#i' => array( 'https://embed.spotify.com/oembed/', true ),
</span><span class="cx"> );
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the list of oEmbed providers.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/media.php (26977 => 26978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/media.php 2014-01-17 18:14:15 UTC (rev 26977)
+++ trunk/tests/phpunit/tests/media.php 2014-01-17 19:45:51 UTC (rev 26978)
</span><span class="lines">@@ -114,6 +114,24 @@
</span><span class="cx"> $this->assertFalse( wp_oembed_remove_provider( 'http://foo.bar/*' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Test secure youtube.com embeds
+ *
+ * @ticket 23149
+ */
+ function test_youtube_com_secure_embed() {
+ global $wp_embed;
+
+ $out = wp_oembed_get( 'http://www.youtube.com/watch?v=oHg5SJYRHA0' );
+ $this->assertContains( 'http://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out );
+
+ $out = wp_oembed_get( 'https://www.youtube.com/watch?v=oHg5SJYRHA0' );
+ $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out );
+
+ $out = wp_oembed_get( 'https://youtu.be/zHjMoNQN7s0' );
+ $this->assertContains( 'https://www.youtube.com/embed/zHjMoNQN7s0?feature=oembed', $out );
+ }
+
</ins><span class="cx"> function test_wp_prepare_attachment_for_js() {
</span><span class="cx"> // Attachment without media
</span><span class="cx"> $id = wp_insert_attachment(array(
</span></span></pre>
</div>
</div>
</body>
</html>