summaryrefslogtreecommitdiffstats
path: root/wp-includes/formatting.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-02-21 11:12:52 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-02-21 11:12:52 +0000
commit034124e51a783a5034245f5c0d90a98318c623c2 (patch)
tree45b1612e798ab5ebda2be6ed5454d7f160d54cdf /wp-includes/formatting.php
parentd048d2102a66716887bd31c20e391de2d2069601 (diff)
downloadwordpress-mu-034124e51a783a5034245f5c0d90a98318c623c2.tar.gz
wordpress-mu-034124e51a783a5034245f5c0d90a98318c623c2.tar.xz
wordpress-mu-034124e51a783a5034245f5c0d90a98318c623c2.zip
WP Merge to rev 4904
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@894 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/formatting.php')
-rw-r--r--wp-includes/formatting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index dad5e78..25971d3 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -56,7 +56,7 @@ function wpautop($pee, $br = 1) {
$pee = $pee . "\n"; // just to make things a little easier, pad the end
$pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
// Space things out a little
- $allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|style|script|object|input|param|p|h[1-6])';
+ $allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|script|object|input|param|p|h[1-6])';
$pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
$pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines