Changeset 4894

Timestamp:

02/20/2007 05:41:39 AM (18 years ago)

Author:

ryan

Message:

Don't insert p inside of div. fixes #3669

Files:

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

branches/2.1/wp-includes/formatting.php

@@ -64 +64 @@
     $pee = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
     $pee = preg_replace('|<p>\s*?</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
-    $pee = preg_replace( '|<p>(<div[^>]*>\s*)|', "$1<p>", $pee );
     $pee = preg_replace('!<p>([^<]+)\s*?(</(?:div|address|form)[^>]*>)!', "<p>$1</p>$2", $pee);
     $pee = preg_replace( '|<p>|', "$1<p>", $pee );
@@ -83 +82 @@
         $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' ", $pee);
     $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
-/**/
+
     return $pee;
 }

trunk/wp-includes/formatting.php

@@ -64 +64 @@
     $pee = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
     $pee = preg_replace('|<p>\s*?</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
-    $pee = preg_replace( '|<p>(<div[^>]*>\s*)|', "$1<p>", $pee );
     $pee = preg_replace('!<p>([^<]+)\s*?(</(?:div|address|form)[^>]*>)!', "<p>$1</p>$2", $pee);
     $pee = preg_replace( '|<p>|', "$1<p>", $pee );
@@ -83 +82 @@
         $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' ", $pee);
     $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
-/**/
+
     return $pee;
 }