<!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>[16280] trunk/wp-includes/formatting.php:
  Improved RegEx for quote matching in wptexturize.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16280">16280</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-11-10 19:23:57 +0000 (Wed, 10 Nov 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Improved RegEx for quote matching in wptexturize. Fixes <a href="http://trac.wordpress.org/ticket/4539">#4539</a> and <a href="http://trac.wordpress.org/ticket/15241">#15241</a> props norbertm.</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 (16279 => 16280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php        2010-11-10 17:47:46 UTC (rev 16279)
+++ trunk/wp-includes/formatting.php        2010-11-10 19:23:57 UTC (rev 16280)
</span><span class="lines">@@ -56,9 +56,25 @@
</span><span class="cx">                 $static_characters = array_merge(array('---', ' -- ', '--', ' - ', 'xn&amp;#8211;', '...', '``', '\'\'', ' (tm)'), $cockney);
</span><span class="cx">                 $static_replacements = array_merge(array('&amp;#8212;', ' &amp;#8212; ', '&amp;#8211;', ' &amp;#8211; ', 'xn--', '&amp;#8230;', $opening_quote, $closing_quote, ' &amp;#8482;'), $cockneyreplace);
</span><span class="cx"> 
</span><del>-                $dynamic_characters = array('/\'(\d\d(?:&amp;#8217;|\')?s)/', '/\'(\d)/', '/(\s|\A|[([{&lt;]|&quot;)\'/', '/(\d)&quot;/', '/(\d)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A|[([{&lt;])&quot;(?!\s)/', '/&quot;(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/\b(\d+)x(\d+)\b/');
-                $dynamic_replacements = array('&amp;#8217;$1','&amp;#8217;$1', '$1&amp;#8216;', '$1&amp;#8243;', '$1&amp;#8242;', '$1&amp;#8217;$2', '$1' . $opening_quote . '$2', $closing_quote . '$1', '&amp;#8217;$1', '$1&amp;#215;$2');
-
</del><ins>+                $dynamic_map = array(
+                        '/\'(\d)/' =&gt; '&amp;#8217;$1', // '99
+                        
+                        '/\'([^\']*)\'([^\']*)\'/' =&gt; '&amp;#8216;$1&amp;#8217;$2&amp;#8217;', // 'test's'
+                        
+                        '/\'([^\']*)\'/' =&gt; '&amp;#8216;$1&amp;#8217;', // 'asd'
+                        '/&quot;([^&quot;]*)&quot;/' =&gt; $opening_quote . '$1' . $closing_quote, // &quot;qwe&quot;
+                        
+                        '/(\w)\'(\w)/' =&gt; '$1&amp;#8217;$2', // test's
+                        
+                        '/(\d)&quot;/' =&gt; '$1&amp;#8243;', // 9&quot; -&gt; 9″
+                        '/(\d)\'/' =&gt; '$1&amp;#8242;', // 9' -&gt; 9′
+                        
+                        '/\b(\d+)x(\d+)\b/' =&gt; '$1&amp;#215;$2' // 10. 97x34 =&gt; 97×34
+                );
+                
+                $dynamic_characters = array_keys($dynamic_map);
+                $dynamic_replacements = array_values($dynamic_map);
+                
</ins><span class="cx">                 $static_setup = true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -69,6 +85,9 @@
</span><span class="cx"> 
</span><span class="cx">         $no_texturize_tags_stack = array();
</span><span class="cx">         $no_texturize_shortcodes_stack = array();
</span><ins>+        
+        $single_quote_state = '&amp;#8216;';
+        $double_quote_state = $opening_quote;
</ins><span class="cx"> 
</span><span class="cx">         for ( $i = 0; $i &lt; $stop; $i++ ) {
</span><span class="cx">                 $curl = $textarr[$i];
</span><span class="lines">@@ -80,6 +99,15 @@
</span><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><ins>+                        // quotes that span multiple tags &amp; shortcodes
+                        while (($pos = strpos($curl, '\'')) !== FALSE) {
+                                $curl = preg_replace('/\'/', $single_quote_state, $curl);
+                                $single_quote_state = (($single_quote_state == '&amp;#8216;') ? '&amp;#8217;' : '&amp;#8216;');
+                        }
+                        while (($pos = strpos($curl, '&quot;')) !== FALSE) {
+                                $curl = preg_replace('/&quot;/', $double_quote_state, $curl);
+                                $double_quote_state = (($double_quote_state == $opening_quote) ? $closing_quote : $opening_quote);
+                        }
</ins><span class="cx">                 } elseif (!empty($curl)) {
</span><span class="cx">                         /*
</span><span class="cx">                          * Only call _wptexturize_pushpop_element if first char is correct
</span></span></pre>
</div>
</div>

</body>
</html>