From 9336db3a63ff73ea10fb075df21be226a64629f3 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 20 Feb 2007 10:56:56 +0000
Subject: wp merge to rev 4896 Ryan's nooption fixes jquery filename is
 different

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@890 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/formatting.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'wp-includes/formatting.php')

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 26b8158..dad5e78 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -63,7 +63,6 @@ function wpautop($pee, $br = 1) {
 	$pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
 	$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 );
 	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
@@ -82,7 +81,7 @@ function wpautop($pee, $br = 1) {
 	if ( strstr( $pee, '<pre' ) )
 		$pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  stripslashes(clean_pre('$2'))  . '</pre>' ", $pee);
 	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
-/**/
+
 	return $pee;
 }
 
-- 
cgit