Changeset 2057

Timestamp:

01/06/2005 10:24:11 AM (22 years ago)

Author:

saxmatt

Message:

Patch for balanceTags from Scott Reilly: ​http://mosquito.wordpress.org/view.php?id=53

File:

• trunk/wp-includes/functions-formatting.php (modified) (6 diffs)

trunk/wp-includes/functions-formatting.php

@@ -316 +316 @@
  @notes           
  @changelog       
+ ---  Modified by Scott Reilly (coffee2code) 02 Aug 2004
              1.2  ***TODO*** Make better - change loop condition to $text
              1.1  Fixed handling of append/stack pop order of end text
@@ -335 +336 @@
 
         while (preg_match("/<(\/?\w*)\s*([^>]*)>/",$text,$regex)) {
-                $newtext = $newtext . $tagqueue;
+                $newtext .= $tagqueue;
 
                 $i = strpos($text,$regex[0]);
-                $l = strlen($tagqueue) + strlen($regex[0]);
+                $l = strlen($regex[0]);
 
                 // clear the shifter
@@ -374 +375 @@
                         // Tag Cleaning
 
-                        // Push if not img or br or hr
-                        if($tag != 'br' && $tag != 'img' && $tag != 'hr') {
+                        // If self-closing or '', don't do anything.
+                        if((substr($regex[2],-1) == '/') || ($tag == '')) {
+                        }
+                        // ElseIf it's a known single-entity tag but it doesn't close itself, do so
+                        elseif ($tag == 'br' || $tag == 'img' || $tag == 'hr' || $tag == 'input') {
+                                $regex[2] .= '/';
+                        } else {        // Push the tag onto the stack
+                                // If the top of the stack is the same as the tag we want to push, close previous tag
+                                if (($stacksize > 0) && ($tag != 'div') && ($tagstack[$stacksize - 1] == $tag)) {
+                                        $tagqueue = '</' . array_pop ($tagstack) . '>';
+                                        $stacksize--;
+                                }
                                 $stacksize = array_push ($tagstack, $tag);
                         }
 
                         // Attributes
-                        // $attributes = $regex[2];
                         $attributes = $regex[2];
                         if($attributes) {
@@ -386 +396 @@
                         }
                         $tag = '<'.$tag.$attributes.'>';
+                        //If already queuing a close tag, then put this tag on, too
+                        if ($tagqueue) {
+                                $tagqueue .= $tag;
+                                $tag = '';
+                        }
                 }
                 $newtext .= substr($text,0,$i) . $tag;
@@ -392 +407 @@
 
         // Clear Tag Queue
-        $newtext = $newtext . $tagqueue;
+        $newtext .= $tagqueue;
 
         // Add Remaining text
@@ -399 +414 @@
         // Empty Stack
         while($x = array_pop($tagstack)) {
-                $newtext = $newtext . '</' . $x . '>'; // Add remaining tags to close      
+                $newtext .= '</' . $x . '>'; // Add remaining tags to close
         }