<!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>[38684] trunk: Embeds: Escape periods in oEmbed regex.</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/38684">38684</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/38684","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-30 11:24:08 +0000 (Fri, 30 Sep 2016)</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'>Embeds: Escape periods in oEmbed regex.
Props jrf.
Fixes <a href="https://core.trac.wordpress.org/ticket/38187">#38187</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclassoembedphp">trunk/src/wp-includes/class-oembed.php</a></li>
<li><a href="#trunktestsphpunittestsoembedphp">trunk/tests/phpunit/tests/oembed.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclassoembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-oembed.php 2016-09-30 05:01:02 UTC (rev 38683)
+++ trunk/src/wp-includes/class-oembed.php 2016-09-30 11:24:08 UTC (rev 38684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://youtu\.be/.*#i' => array( 'https://www.youtube.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(.+\.)?vimeo\.com/.*#i' => array( 'https://vimeo.com/api/oembed.{format}', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?dailymotion\.com/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '#https?://dai.ly/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '#https?://dai\.ly/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?flickr\.com/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://flic\.kr/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(.+\.)?smugmug\.com/.*#i' => array( 'https://api.smugmug.com/services/oembed/', true ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,14 +68,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://i*.photobucket.com/albums/*' => array( 'http://api.photobucket.com/oembed', false ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'http://gi*.photobucket.com/groups/*' => array( 'http://api.photobucket.com/oembed', false ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?scribd\.com/doc/.*#i' => array( 'https://www.scribd.com/services/oembed', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '#https?://wordpress.tv/.*#i' => array( 'https://wordpress.tv/oembed/', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '#https?://wordpress\.tv/.*#i' => array( 'https://wordpress.tv/oembed/', true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '#https?://(.+\.)?polldaddy\.com/.*#i' => array( 'https://polldaddy.com/oembed/', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://poll\.fm/.*#i' => array( 'https://polldaddy.com/oembed/', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?twitter\.com/.+?/timelines/.*#i' => array( 'https://publish.twitter.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?twitter\.com/i/moments/.*#i' => array( 'https://publish.twitter.com/oembed', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '#https?://vine.co/v/.*#i' => array( 'https://vine.co/oembed.{format}', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '#https?://vine\.co/v/.*#i' => array( 'https://vine.co/oembed.{format}', true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?soundcloud\.com/.*#i' => array( 'https://soundcloud.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(.+?\.)?slideshare\.net/.*#i' => array( 'https://www.slideshare.net/api/oembed/2', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i' => array( 'https://api.instagram.com/oembed', true ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://kck\.st/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://cloudup\.com/.*#i' => array( 'https://cloudup.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?reverbnation\.com/.*#i' => array( 'https://www.reverbnation.com/oembed', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '#https?://videopress.com/v/.*#' => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '#https?://videopress\.com/v/.*#' => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i' => array( 'https://www.reddit.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?speakerdeck\.com/.*#i' => array( 'https://speakerdeck.com/oembed.{format}', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://www\.facebook\.com/.*/posts/.*#i' => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed.php 2016-09-30 05:01:02 UTC (rev 38683)
+++ trunk/tests/phpunit/tests/oembed.php 2016-09-30 11:24:08 UTC (rev 38684)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'youtube-shorturl' => '#https?://youtu\.be/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'vimeo' => '#https?://(.+\.)?vimeo\.com/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'dailymotion' => '#https?://(www\.)?dailymotion\.com/.*#i',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'dailymotion-shorturl' => '#https?://dai.ly/.*#i',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'dailymotion-shorturl' => '#https?://dai\.ly/.*#i',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'flickr' => '#https?://(www\.)?flickr\.com/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'flickr-shorturl' => '#https?://flic\.kr/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'smugmug' => '#https?://(.+\.)?smugmug\.com/.*#i',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,14 +16,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'photobucket-album' => 'http://i*.photobucket.com/albums/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'photobucket-group' => 'http://gi*.photobucket.com/groups/*',
</span><span class="cx" style="display: block; padding: 0 10px"> 'scribd' => '#https?://(www\.)?scribd\.com/doc/.*#i',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wordpress-tv' => '#https?://wordpress.tv/.*#i',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wordpress-tv' => '#https?://wordpress\.tv/.*#i',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'polldaddy' => '#https?://(.+\.)?polldaddy\.com/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'polldaddy-shorturl' => '#https?://poll\.fm/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'funnyordie' => '#https?://(www\.)?funnyordie\.com/videos/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'twitter' => '#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'twitter-timeline' => '#https?://(www\.)?twitter\.com/.+?/timelines/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'twitter-moment' => '#https?://(www\.)?twitter\.com/i/moments/.*#i',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'vine' => '#https?://vine.co/v/.*#i',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'vine' => '#https?://vine\.co/v/.*#i',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'soundcloud' => '#https?://(www\.)?soundcloud\.com/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'slideshare' => '#https?://(.+?\.)?slideshare\.net/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'instagram' => '#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'kickstarter-shorturl' => '#https?://kck\.st/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'cloudup' => '#https?://cloudup\.com/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'reverbnation' => '#https?://(www\.)?reverbnation\.com/.*#i',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'videopress' => '#https?://videopress.com/v/.*#',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'videopress' => '#https?://videopress\.com/v/.*#',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'reddit-comments' => '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'speakerdeck' => '#https?://(www\.)?speakerdeck\.com/.*#i',
</span><span class="cx" style="display: block; padding: 0 10px"> 'facebook-post' => '#https?://www\.facebook\.com/.*/posts/.*#i',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,4 +812,37 @@
</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">+ /**
+ * Test URLs that should not match any of the predefined providers.
+ *
+ * @group oembed
+ * @ticket 38187
+ *
+ * @dataProvider dataShouldNotMatchOembedRegex
+ */
+ public function testUrlShouldNotMatchOembedRegex( $url ) {
+
+ $this->assertSame( false, self::$oembed->get_provider( $url, array( 'discover' => false ) ) );
+
+ }
+
+ /**
+ * Data provider for testUrlShouldNotMatchOembedRegex().
+ *
+ * @return array
+ */
+ public function dataShouldNotMatchOembedRegex() {
+ $providers = self::$provider_map;
+
+ return array(
+ array( 'http://dairly/something' ),
+ array( 'https://daisly/' ),
+ array( 'http://wordpressstv/' ),
+ array( 'https://wordpressstv/somethingelse' ),
+ array( 'http://vinerco/v/andanother' ),
+ array( 'https://vineqco/v/' ),
+ array( 'http://videopressscom/v/' ),
+ array( 'https://videopresstcom/v/covered' ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>