Changeset 3273

Timestamp:

12/05/2005 05:00:01 PM (19 years ago)

Author:

ryan

Message:

autop fixes from skeltoac. fixes #2022

Location:

trunk/wp-includes

Files:

• functions-formatting.php (modified) (1 diff)
• js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)

trunk/wp-includes/functions-formatting.php

@@ -60 +60 @@
     // Space things out a little
     $pee = preg_replace('!(<(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)!', "\n$1", $pee); 
-    $pee = preg_replace('!(</(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])>)!', "$1\n", $pee);
+    $pee = preg_replace('!(</(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6])>)!', "$1\n\n", $pee);
     $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines 
     $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>\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
+    $pee = preg_replace('!<p>\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6])[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
     $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee); // problem with nested lists
     $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -267 +267 @@
 
     // Fix some block element newline issues
-    var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\d|pre';
+    var blocklist = 'blockquote|ul|ol|li|table|thead|tr|th|td|div|h\\d|pre';
     content = content.replace(new RegExp('\\s*<(('+blocklist+') ?[^>]*)\\s*>', 'mg'), '\n<$1>');
     content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');