<!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>[34736] trunk/src/wp-admin/includes/class-wp-press-this.php: Press This: Make the regular expressions for matching images easier to read by not requiring escaping.</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/34736">34736</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/34736","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-01 05:15:05 +0000 (Thu, 01 Oct 2015)</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'>Press This: Make the regular expressions for matching images easier to read by not requiring escaping.
Fixes <a href="https://core.trac.wordpress.org/ticket/32878">#32878</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswppressthisphp">trunk/src/wp-admin/includes/class-wp-press-this.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswppressthisphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-press-this.php 2015-10-01 05:12:39 UTC (rev 34735)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2015-10-01 05:15:05 UTC (rev 34736)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,8 +390,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Utility method to limit image source URLs.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Excluded URLs include share-this type buttons, loaders, spinners, spacers, WP interface images,
- * tiny buttons or thumbs, mathtag.com or quantserve.com images, or the WP stats gif.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Excluded URLs include share-this type buttons, loaders, spinners, spacers, WordPress interface images,
+ * tiny buttons or thumbs, mathtag.com or quantserve.com images, or the WordPress.com stats gif.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ignore
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,32 +402,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function _limit_img( $src ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $src = $this->_limit_url( $src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( preg_match( '/\/ad[sx]{1}?\//', $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '!/ad[sx]?/!i', $src ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Ads
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/(\/share-?this[^\.]+?\.[a-z0-9]{3,4})(\?.*)?$/', $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Share-this type button
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)/', $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Loaders, spinners, spacers
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/([^\.\/]+[-_]{1})?(spinner|loading|spacer|blank)s?([-_]{1}[^\.\/]+)?\.[a-z0-9]{3,4}/', $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Fancy loaders, spinners, spacers
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/([^\.\/]+[-_]{1})?thumb[^.]*\.(gif|jpg|png)$/', $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Thumbnails, too small, usually irrelevant to context
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/wp-includes\//', $src ) ) {
- // Classic WP interface images
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( false !== stripos( $src, '/wp-includes/' ) ) {
+ // Classic WordPress interface images
</ins><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/[^\d]{1}\d{1,2}x\d+\.(gif|jpg|png)$/', $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Most often tiny buttons/thumbs (< 100px wide)
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/pixel\.(mathtag|quantserve)\.com/', $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!/pixel\.(mathtag|quantserve)\.com!i', $src ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // See mathtag.com and https://www.quantcast.com/how-we-do-it/iab-standard-measurement/how-we-collect-data/
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/[gb]\.gif(\?.+)?$/', $src ) ) {
- // Classic WP stats gif
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!/[gb]\.gif(\?.+)?$!i', $src ) ) {
+ // WordPress.com stats gif
</ins><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,19 +452,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $src ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( preg_match( '/\/\/(m|www)\.youtube\.com\/(embed|v)\/([^\?]+)\?.+$/', $src, $src_matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Embedded Youtube videos (www or mobile)
</span><span class="cx" style="display: block; padding: 0 10px"> $src = 'https://www.youtube.com/watch?v=' . $src_matches[3];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/\/player\.vimeo\.com\/video\/([\d]+)([\?\/]{1}.*)?$/', $src, $src_matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Embedded Vimeo iframe videos
</span><span class="cx" style="display: block; padding: 0 10px"> $src = 'https://vimeo.com/' . (int) $src_matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/\/vimeo\.com\/moogaloop\.swf\?clip_id=([\d]+)$/', $src, $src_matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Embedded Vimeo Flash videos
</span><span class="cx" style="display: block; padding: 0 10px"> $src = 'https://vimeo.com/' . (int) $src_matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/\/vine\.co\/v\/([^\/]+)\/embed/', $src, $src_matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Embedded Vine videos
</span><span class="cx" style="display: block; padding: 0 10px"> $src = 'https://vine.co/v/' . $src_matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/\/\/(www\.)?dailymotion\.com\/embed\/video\/([^\/\?]+)([\/\?]{1}.+)?/', $src, $src_matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( preg_match( '!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Embedded Daily Motion videos
</span><span class="cx" style="display: block; padding: 0 10px"> $src = 'https://www.dailymotion.com/video/' . $src_matches[2];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>