Changeset 5623 for trunk/wp-includes/formatting.php

Timestamp:

06/01/2007 02:33:03 AM (17 years ago)

Author:

rob1n

Message:

Fix nestable HTML, including <blockquote>'s. Props anonymousbugger (!) and Nazgul. fixes #1170

File:

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

trunk/wp-includes/formatting.php

@@ -440 +440 @@
 
     $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
 
     # WP bug fix for comments - in case you REALLY meant to type '< !--'
@@ -490 +492 @@
             }
             // 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') {
+            elseif ( in_array($tag, $single_tags) ) {
                 $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)) {
+                if (($stacksize > 0) && !in_array($tag, $nestable_tags) && ($tagstack[$stacksize - 1] == $tag)) {
                     $tagqueue = '</' . array_pop ($tagstack) . '>';
                     $stacksize--;