summaryrefslogtreecommitdiffstats
path: root/wp-includes/js/tinymce
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-19 16:06:15 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-19 16:06:15 +0000
commitae484584028c752efb5faa4c02259556e853d26e (patch)
treeef88d82a06a9226b332b74b013b4d85a896852b0 /wp-includes/js/tinymce
parent882678aa9ed2d369d1a4c66696df002f44aae889 (diff)
downloadwordpress-mu-ae484584028c752efb5faa4c02259556e853d26e.tar.gz
wordpress-mu-ae484584028c752efb5faa4c02259556e853d26e.tar.xz
wordpress-mu-ae484584028c752efb5faa4c02259556e853d26e.zip
WP Merge to 4197
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@761 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/js/tinymce')
-rw-r--r--wp-includes/js/tinymce/tiny_mce_config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php
index 283ffb8..dad3aff 100644
--- a/wp-includes/js/tinymce/tiny_mce_config.php
+++ b/wp-includes/js/tinymce/tiny_mce_config.php
@@ -21,7 +21,7 @@
}
// Set up init variables
- $valid_elements = 'p/-div[*],-b[*],-font[*],-ul[*],-ol[*],-li[*],*[*]';
+ $valid_elements = 'p/-div[*],-strong/-b[*],-em/-i[*],-font[*],-ul[*],-ol[*],-li[*],*[*]';
$valid_elements = apply_filters('mce_valid_elements', $valid_elements);
$plugins = array('inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress');