diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-12-05 15:29:53 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-12-05 15:29:53 +0000 |
| commit | 3055390b6908c8335d154dd8e4dfa374b7fa3783 (patch) | |
| tree | ed05c0516b4cf40831ae49a747946fcfd9162b7f /wp-inst/wp-admin/admin-header.php | |
| parent | fba798a103256f5f400cb1a1dcb9cc5b45cf8166 (diff) | |
| download | wordpress-mu-3055390b6908c8335d154dd8e4dfa374b7fa3783.tar.gz wordpress-mu-3055390b6908c8335d154dd8e4dfa374b7fa3783.tar.xz wordpress-mu-3055390b6908c8335d154dd8e4dfa374b7fa3783.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@461 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/admin-header.php')
| -rw-r--r-- | wp-inst/wp-admin/admin-header.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php index c09fa5d..00429ab 100644 --- a/wp-inst/wp-admin/admin-header.php +++ b/wp-inst/wp-admin/admin-header.php @@ -99,7 +99,7 @@ tinyMCE.init({ theme_advanced_toolbar_align : "left", theme_advanced_path_location : "bottom", theme_advanced_resizing : true, - browsers : "msie,gecko", + browsers : "msie,gecko,opera", dialog_type : "modal", theme_advanced_resize_horizontal : false, entity_encoding : "raw", @@ -110,7 +110,7 @@ tinyMCE.init({ convert_newlines_to_brs : false, remove_linebreaks : true, save_callback : "wp_save_callback", - valid_elements : "-a[id|href|title|rel],-strong/b,-em/i,-strike,-del,-u,p[class|align|dir],-ol,-ul,-li,br,img[class|src|alt|title|width|height|align],-sub,-sup,-blockquote[dir],-table[border=0|cellspacing|cellpadding|width|height|class|align|dir],tr[class|rowspan|width|height|align|valign|dir],td[dir|class|colspan|rowspan|width|height|align|valign],-div[dir|class|align],-span[class|align],-pre[class],-code[class],-address,-h1[class|align|dir],-h2[class|align|dir],-h3[class|align|dir],-h4[class|align|dir],-h5[class|align|dir],-h6[class|align|dir],hr", + valid_elements : "-a[id|href|title|rel],-strong/b,-em/i,-strike,-del,-u,p[class|align|dir],-ol,-ul,-li,br,img[class|src|alt|title|width|height|align],-sub,-sup,-blockquote[dir],-table[border=0|cellspacing|cellpadding|width|height|class|align|dir],thead[class|rowspan|width|height|align|valign|dir],tr[class|rowspan|width|height|align|valign|dir],th[dir|class|colspan|rowspan|width|height|align|valign|scope],td[dir|class|colspan|rowspan|width|height|align|valign],-div[dir|class|align],-span[class|align],-pre[class],-code[class],-address,-h1[class|align|dir],-h2[class|align|dir],-h3[class|align|dir],-h4[class|align|dir],-h5[class|align|dir],-h6[class|align|dir],hr", plugins : "<?php echo $mce_plugins; ?>" <?php do_action('mce_options'); ?> }); |