<!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>[10401] sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-links/trac-links.php: Trac Links: Inverse the matching to split by finding tags first and processing content outside of tags, rather than searching for text outside of tags.</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 { white-space: pre-line; 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="http://meta.trac.wordpress.org/changeset/10401">10401</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/10401","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>2020-10-23 04:15:45 +0000 (Fri, 23 Oct 2020)</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'>Trac Links: Inverse the matching to split by finding tags first and processing content outside of tags, rather than searching for text outside of tags.
This resolves some performance issues with long posts containing many links, causing increasing pageload delays based on the number of tags present.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginstraclinkstraclinksphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-links/trac-links.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginstraclinkstraclinksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-links/trac-links.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-links/trac-links.php 2020-10-23 04:10:26 UTC (rev 10400)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-links/trac-links.php 2020-10-23 04:15:45 UTC (rev 10401)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Plugin Name: Trac Links
-Plugin URI: http://wordpress.org/
-Description: Link ticket and changeset numbers to core.trac.
-Version: 1.0
-Author: Automattic
-Author URI: http://wordpress.org/
-*/
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Plugin Name: Trac Links
+ * Plugin URI: https://wordpress.org/
+ * Description: Link ticket and changeset numbers to core.trac.
+ * Version: 1.0
+ * Author: WordPress.org
+ * Author URI: https://wordpress.org/
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', 'markup_wporg_links', 0, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_text', 'markup_wporg_links', 0, 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,11 +32,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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">+ $tracs = 'core|blackberry|nokia|webos|plugins|bbpress|buddypress|supportpress|glotpress|backpress|windows|themes|meta';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $find = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/(\s|^|\()(#(\d{4,5})-(core|blackberry|nokia|webos|plugins|bbpress|buddypress|supportpress|glotpress|backpress|windows|themes|meta))(\b|$)/im', // trac ticket #1234-plugins in http://plugins.trac.wordpress.org/ticket/1234
- '/(\s|^|\()(r(\d{4,5})-(core|blackberry|nokia|webos|plugins|bbpress|buddypress|supportpress|glotpress|backpress|windows|themes|meta))(\b|$)/im', // changeset r1234-plugins in http://plugins.trac.wordpress.org/changeset/1234
- '/(\s|^|\()(#(core|blackberry|nokia|webos|plugins|bbpress|buddypress|supportpress|glotpress|backpress|windows|themes|meta)(\d{4,5}))(\b|$)/im', // trac ticket #1234-plugins in http://plugins.trac.wordpress.org/ticket/1234
- '/(\s|^|\()(r(core|blackberry|nokia|webos|plugins|bbpress|buddypress|supportpress|glotpress|backpress|windows|themes|meta)(\d{4,5}))(\b|$)/im', // changeset r1234-plugins in http://plugins.trac.wordpress.org/changeset/1234
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '/(\s|^|\()(#(\d{4,5})-(' . $tracs . '))(\b|$)/im', // trac ticket #1234-plugins in http://plugins.trac.wordpress.org/ticket/1234
+ '/(\s|^|\()(r(\d{4,5})-(' . $tracs . '))(\b|$)/im', // changeset r1234-plugins in http://plugins.trac.wordpress.org/changeset/1234
+ '/(\s|^|\()(#(' . $tracs . ')(\d{4,5}))(\b|$)/im', // trac ticket #1234-plugins in http://plugins.trac.wordpress.org/ticket/1234
+ '/(\s|^|\()(r(' . $tracs . ')(\d{4,5}))(\b|$)/im', // changeset r1234-plugins in http://plugins.trac.wordpress.org/changeset/1234
</ins><span class="cx" style="display: block; padding: 0 10px"> '/(\s|^|\()(#(\d{4,5}))(\b|$)/im', // core trac ticket #1234 in http://core.trac.wordpress.org/ticket/1234
</span><span class="cx" style="display: block; padding: 0 10px"> '/(\s|^|\()(r(\d{4,5}))(\b|$)/im', // core changeset r1234 in http://core.trac.wordpress.org/changeset/1234
</span><span class="cx" style="display: block; padding: 0 10px"> '/(?<!\w)\[(\d{4,5})\](?!\w)/im', // core changeset [12345]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,10 +58,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '$1<a href="https://'. $trac .'.trac.wordpress.org/changeset?new=$4&old=$3">$2</a>', // diff
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match_all('#[^>]+(?=<[^/]*[^a])|[^>]+$#', $content, $matches, PREG_SET_ORDER);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Regex and loop based on convert_smilies();
+ $arr = preg_split( '/(<.*>)/U', $content, -1, PREG_SPLIT_DELIM_CAPTURE );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $matches as $val ) {
- $content = str_replace($val[0],preg_replace($find,$replace,$val[0]),$content);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tags_to_ignore = 'a|code|pre';
+ $ignore_element = false;
+ $len = count( $arr );
+
+ for ( $i = 0; $i <= $len; $i++ ) {
+ $text = $arr[ $i ];
+ $is_tag = '<' === $text[0];
+
+ // Is this a HTML tag we want to skip the contents of?
+ if (
+ $is_tag &&
+ ! $ignore_element &&
+ preg_match( '/^<(' . $tags_to_ignore . ')[^>]*>/', $text, $matches )
+ ) {
+ $ignore_element = $matches[1];
+ $closing_tag = '</' . $ignore_element . '>';
+ }
+
+ // Process this stand-alone chunk of text.
+ if ( ! $is_tag && ! $ignore_element && strlen( $text ) ) {
+ $content = str_replace( $text, preg_replace( $find, $replace, $text ), $content );
+ }
+
+ // Did we leave the ignored tag?
+ if ( $is_tag && $ignore_element && $closing_tag === $text ) {
+ $ignore_element = false;
+ }
</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"> return $content;
</span></span></pre>
</div>
</div>
</body>
</html>