Changeset 3273

Timestamp:

12/05/05 17:00:01 (3 years ago)

Author:

ryan

Message:

autop fixes from skeltoac. fixes #2022

Files:

• trunk/wp-includes/functions-formatting.php (modified) (1 diff)
• trunk/wp-includes/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); 
-
+\n
-    $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>(<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
-
+\
-    content = content.replace(new RegExp('\\s*<(('+blocklist+') ?[^>]*)\\s*>', 'mg'), '\n<$1>');
-    content = content.replace(new RegExp('\\s*</('+blocklist+')>\\s*', 'mg'), '</$1>\n');