From ac40df7d99597ed0e6aaf4b6d3007656e5cb1a39 Mon Sep 17 00:00:00 2001
From: Andrew Ozz
Date: Thu, 23 Apr 2009 08:28:22 +0000
Subject: [PATCH] Add to list of block elements, props CharlieHamu and
Denis-de-Bernardy, fixes #9484
git-svn-id: https://develop.svn.wordpress.org/trunk@11070 602fd350-edb4-49c9-b593-d223f7449a82
---
wp-admin/js/editor.dev.js | 2 +-
wp-admin/js/editor.js | 2 +-
wp-includes/formatting.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/wp-admin/js/editor.dev.js b/wp-admin/js/editor.dev.js
index 55a5f418bf..2fd9157209 100644
--- a/wp-admin/js/editor.dev.js
+++ b/wp-admin/js/editor.dev.js
@@ -136,7 +136,7 @@ var switchEditors = {
},
wpautop : function(pee) {
- var blocklist = '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]';
+ var blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]';
if ( pee.indexOf('
");b=b.replace(new RegExp("]*)>\\s*
","mgi"),"
\n\n");b=b.replace(new RegExp("\\s*
","mgi"),"");b=b.replace(new RegExp("\\s*
\\s*","mgi"),"\n\n");b=b.replace(new RegExp("\\n\\s*\\n","mgi"),"\n\n");b=b.replace(new RegExp("\\s*
\\s*","gi"),"\n");b=b.replace(new RegExp("\\s*
\\s*","mg"),"
\n");b=b.replace(new RegExp("\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*","gi"),"\n\n[caption$1[/caption]\n\n");b=b.replace(new RegExp("caption\\]\\n\\n+\\[caption","g"),"caption]\n\n[caption");a="blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre";b=b.replace(new RegExp("\\s*<(("+a+") ?[^>]*)\\s*>","mg"),"\n<$1>");b=b.replace(new RegExp("\\s*("+a+")>\\s*","mg"),"$1>\n");b=b.replace(new RegExp("
]*)>","g"),"\t");if(b.indexOf("