<!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>[13914] trunk/wp-includes/formatting.php:
  Whitespace and coding standards cleanup for balanceTags().</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13914">13914</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-01 13:18:34 +0000 (Thu, 01 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Whitespace and coding standards cleanup for balanceTags(). See <a href="http://trac.wordpress.org/ticket/11968">#11968</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 (13913 => 13914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php        2010-04-01 13:16:44 UTC (rev 13913)
+++ trunk/wp-includes/formatting.php        2010-04-01 13:18:34 UTC (rev 13914)
</span><span class="lines">@@ -1028,19 +1028,22 @@
</span><span class="cx">  * @return string Balanced text.
</span><span class="cx">  */
</span><span class="cx"> function force_balance_tags( $text ) {
</span><del>-        $tagstack = array(); $stacksize = 0; $tagqueue = ''; $newtext = '';
-        $single_tags = array('br', 'hr', 'img', 'input'); //Known single-entity/self-closing tags
-        $nestable_tags = array('blockquote', 'div', 'span'); //Tags that can be immediately nested within themselves
</del><ins>+        $tagstack = array();
+        $stacksize = 0;
+        $tagqueue = '';
+        $newtext = '';
+        $single_tags = array('br', 'hr', 'img', 'input'); // Known single-entity/self-closing tags
+        $nestable_tags = array('blockquote', 'div', 'span'); // Tags that can be immediately nested within themselves
</ins><span class="cx"> 
</span><del>-        # WP bug fix for comments - in case you REALLY meant to type '&lt; !--'
</del><ins>+        // WP bug fix for comments - in case you REALLY meant to type '&lt; !--'
</ins><span class="cx">         $text = str_replace('&lt; !--', '&lt;    !--', $text);
</span><del>-        # WP bug fix for LOVE &lt;3 (and other situations with '&lt;' before a number)
</del><ins>+        // WP bug fix for LOVE &lt;3 (and other situations with '&lt;' before a number)
</ins><span class="cx">         $text = preg_replace('#&lt;([0-9]{1})#', '&amp;lt;$1', $text);
</span><span class="cx"> 
</span><del>-        while (preg_match(&quot;/&lt;(\/?[\w:]*)\s*([^&gt;]*)&gt;/&quot;,$text,$regex)) {
</del><ins>+        while ( preg_match(&quot;/&lt;(\/?[\w:]*)\s*([^&gt;]*)&gt;/&quot;, $text, $regex) ) {
</ins><span class="cx">                 $newtext .= $tagqueue;
</span><span class="cx"> 
</span><del>-                $i = strpos($text,$regex[0]);
</del><ins>+                $i = strpos($text, $regex[0]);
</ins><span class="cx">                 $l = strlen($regex[0]);
</span><span class="cx"> 
</span><span class="cx">                 // clear the shifter
</span><span class="lines">@@ -1049,22 +1052,22 @@
</span><span class="cx">                 if ( isset($regex[1][0]) &amp;&amp; '/' == $regex[1][0] ) { // End Tag
</span><span class="cx">                         $tag = strtolower(substr($regex[1],1));
</span><span class="cx">                         // if too many closing tags
</span><del>-                        if($stacksize &lt;= 0) {
</del><ins>+                        if( $stacksize &lt;= 0 ) {
</ins><span class="cx">                                 $tag = '';
</span><del>-                                //or close to be safe $tag = '/' . $tag;
</del><ins>+                                // or close to be safe $tag = '/' . $tag;
</ins><span class="cx">                         }
</span><span class="cx">                         // if stacktop value = tag close value then pop
</span><del>-                        else if ($tagstack[$stacksize - 1] == $tag) { // found closing tag
</del><ins>+                        else if ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
</ins><span class="cx">                                 $tag = '&lt;/' . $tag . '&gt;'; // Close Tag
</span><span class="cx">                                 // Pop
</span><del>-                                array_pop ($tagstack);
</del><ins>+                                array_pop( $tagstack );
</ins><span class="cx">                                 $stacksize--;
</span><span class="cx">                         } else { // closing tag not at top, search for it
</span><del>-                                for ($j=$stacksize-1;$j&gt;=0;$j--) {
-                                        if ($tagstack[$j] == $tag) {
</del><ins>+                                for ( $j = $stacksize-1; $j &gt;= 0; $j-- ) {
+                                        if ( $tagstack[$j] == $tag ) {
</ins><span class="cx">                                         // add tag to tagqueue
</span><del>-                                                for ($k=$stacksize-1;$k&gt;=$j;$k--){
-                                                        $tagqueue .= '&lt;/' . array_pop ($tagstack) . '&gt;';
</del><ins>+                                                for ( $k = $stacksize-1; $k &gt;= $j; $k--) {
+                                                        $tagqueue .= '&lt;/' . array_pop( $tagstack ) . '&gt;';
</ins><span class="cx">                                                         $stacksize--;
</span><span class="cx">                                                 }
</span><span class="cx">                                                 break;
</span><span class="lines">@@ -1078,14 +1081,15 @@
</span><span class="cx">                         // Tag Cleaning
</span><span class="cx"> 
</span><span class="cx">                         // If self-closing or '', don't do anything.
</span><del>-                        if((substr($regex[2],-1) == '/') || ($tag == '')) {
</del><ins>+                        if ( substr($regex[2],-1) == '/' || $tag == '' ) {
+                                // do nothing
</ins><span class="cx">                         }
</span><span class="cx">                         // ElseIf it's a known single-entity tag but it doesn't close itself, do so
</span><span class="cx">                         elseif ( in_array($tag, $single_tags) ) {
</span><span class="cx">                                 $regex[2] .= '/';
</span><span class="cx">                         } else {        // Push the tag onto the stack
</span><span class="cx">                                 // If the top of the stack is the same as the tag we want to push, close previous tag
</span><del>-                                if (($stacksize &gt; 0) &amp;&amp; !in_array($tag, $nestable_tags) &amp;&amp; ($tagstack[$stacksize - 1] == $tag)) {
</del><ins>+                                if ( $stacksize &gt; 0 &amp;&amp; !in_array($tag, $nestable_tags) &amp;&amp; $tagstack[$stacksize - 1] == $tag ) {
</ins><span class="cx">                                         $tagqueue = '&lt;/' . array_pop ($tagstack) . '&gt;';
</span><span class="cx">                                         $stacksize--;
</span><span class="cx">                                 }
</span><span class="lines">@@ -1094,18 +1098,18 @@
</span><span class="cx"> 
</span><span class="cx">                         // Attributes
</span><span class="cx">                         $attributes = $regex[2];
</span><del>-                        if($attributes) {
</del><ins>+                        if( !empty($attributes) )
</ins><span class="cx">                                 $attributes = ' '.$attributes;
</span><del>-                        }
-                        $tag = '&lt;'.$tag.$attributes.'&gt;';
</del><ins>+
+                        $tag = '&lt;' . $tag . $attributes . '&gt;';
</ins><span class="cx">                         //If already queuing a close tag, then put this tag on, too
</span><del>-                        if ($tagqueue) {
</del><ins>+                        if ( !empty($tagqueue) ) {
</ins><span class="cx">                                 $tagqueue .= $tag;
</span><span class="cx">                                 $tag = '';
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><del>-                $newtext .= substr($text,0,$i) . $tag;
-                $text = substr($text,$i+$l);
</del><ins>+                $newtext .= substr($text, 0, $i) . $tag;
+                $text = substr($text, $i + $l);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Clear Tag Queue
</span><span class="lines">@@ -1115,9 +1119,8 @@
</span><span class="cx">         $newtext .= $text;
</span><span class="cx"> 
</span><span class="cx">         // Empty Stack
</span><del>-        while($x = array_pop($tagstack)) {
</del><ins>+        while( $x = array_pop($tagstack) )
</ins><span class="cx">                 $newtext .= '&lt;/' . $x . '&gt;'; // Add remaining tags to close
</span><del>-        }
</del><span class="cx"> 
</span><span class="cx">         // WP fix for the bug with HTML comments
</span><span class="cx">         $newtext = str_replace(&quot;&lt; !--&quot;,&quot;&lt;!--&quot;,$newtext);
</span></span></pre>
</div>
</div>

</body>
</html>