diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-07 17:16:43 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-07 17:16:43 +0000 |
| commit | 6081c995737157ea06244568c48570148b08258f (patch) | |
| tree | c74a90925305ffff924a8261efd1d92265e3146c /wp-admin/js/editor.js | |
| parent | 62cf455ec3bed02f518048f8ddca91a23e6b95a4 (diff) | |
| download | wordpress-mu-6081c995737157ea06244568c48570148b08258f.tar.gz wordpress-mu-6081c995737157ea06244568c48570148b08258f.tar.xz wordpress-mu-6081c995737157ea06244568c48570148b08258f.zip | |
WP Merge to revision 8266
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1355 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/js/editor.js')
| -rw-r--r-- | wp-admin/js/editor.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wp-admin/js/editor.js b/wp-admin/js/editor.js index d2049e4..7f5875a 100644 --- a/wp-admin/js/editor.js +++ b/wp-admin/js/editor.js @@ -53,6 +53,7 @@ switchEditors = { content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div'); content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n'); content = content.replace(new RegExp('\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*', 'gi'), '\n\n[wp_caption$1[/wp_caption]\n\n'); + content = content.replace(new RegExp('wp_caption\\]\\n\\n+\\[wp_caption', 'g'), 'wp_caption]\n\n[wp_caption'); var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre'; content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n<$1>'); |