<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17636] trunk/wp-includes/formatting.php:
Performance improvements for wptexturize().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17636">17636</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-13 17:11:35 +0000 (Wed, 13 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Performance improvements for wptexturize(). Props solarissmoke, hakre. fixes <a href="http://trac.wordpress.org/ticket/16684">#16684</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (17635 => 17636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2011-04-13 17:02:52 UTC (rev 17635)
+++ trunk/wp-includes/formatting.php 2011-04-13 17:11:35 UTC (rev 17636)
</span><span class="lines">@@ -28,14 +28,10 @@
</span><span class="cx"> */
</span><span class="cx"> function wptexturize($text) {
</span><span class="cx"> global $wp_cockneyreplace;
</span><del>- static $static_setup = false, $opening_quote, $closing_quote, $default_no_texturize_tags, $default_no_texturize_shortcodes, $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements;
- $output = '';
- $curl = '';
- $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
- $stop = count($textarr);
</del><ins>+ static $opening_quote, $closing_quote, $default_no_texturize_tags, $default_no_texturize_shortcodes, $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements;
</ins><span class="cx">
</span><del>- // No need to set up these variables more than once
- if (!$static_setup) {
</del><ins>+ // No need to set up these static variables more than once
+ if ( empty( $opening_quote ) ) {
</ins><span class="cx"> /* translators: opening curly quote */
</span><span class="cx"> $opening_quote = _x('&#8220;', 'opening curly quote');
</span><span class="cx"> /* translators: closing curly quote */
</span><span class="lines">@@ -58,8 +54,6 @@
</span><span class="cx">
</span><span class="cx"> $dynamic_characters = array('/\'(\d\d(?:&#8217;|\')?s)/', '/\'(\d)/', '/(\s|\A|[([{<]|")\'/', '/(\d)"/', '/(\d)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A|[([{<])"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/\b(\d+)x(\d+)\b/');
</span><span class="cx"> $dynamic_replacements = array('&#8217;$1','&#8217;$1', '$1&#8216;', '$1&#8243;', '$1&#8242;', '$1&#8217;$2', '$1' . $opening_quote . '$2', $closing_quote . '$1', '&#8217;$1', '$1&#215;$2');
</span><del>-
- $static_setup = true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Transform into regexp sub-expression used in _wptexturize_pushpop_element
</span><span class="lines">@@ -70,32 +64,27 @@
</span><span class="cx"> $no_texturize_tags_stack = array();
</span><span class="cx"> $no_texturize_shortcodes_stack = array();
</span><span class="cx">
</span><del>- for ( $i = 0; $i < $stop; $i++ ) {
- $curl = $textarr[$i];
</del><ins>+ $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
</ins><span class="cx">
</span><del>- if ( !empty($curl) && '<' != $curl[0] && '[' != $curl[0]
- && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
- // This is not a tag, nor is the texturization disabled
- // static strings
</del><ins>+ foreach ( $textarr as &$curl ) {
+ if ( empty( $curl ) )
+ continue;
+
+ // Only call _wptexturize_pushpop_element if first char is correct tag opening
+ $first = $curl[0];
+ if ( '<' === $first ) {
+ _wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>');
+ } elseif ( '[' === $first ) {
+ _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
+ } elseif ( empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack) ) {
+ // This is not a tag, nor is the texturization disabled static strings
</ins><span class="cx"> $curl = str_replace($static_characters, $static_replacements, $curl);
</span><span class="cx"> // regular expressions
</span><span class="cx"> $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
</span><del>- } elseif (!empty($curl)) {
- /*
- * Only call _wptexturize_pushpop_element if first char is correct
- * tag opening
- */
- if ('<' == $curl[0])
- _wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>');
- elseif ('[' == $curl[0])
- _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> $curl = preg_replace('/&([^#])(?![a-zA-Z1-4]{1,8};)/', '&#038;$1', $curl);
</span><del>- $output .= $curl;
</del><span class="cx"> }
</span><del>-
- return $output;
</del><ins>+ return implode( '', $textarr );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>