diff --git wp-admin/includes/post.php wp-admin/includes/post.php
index 510d59f..47377ae 100644
|
|
|
function wp_tiny_mce( $teeny = false, $settings = false ) { |
| 1559 | 1559 | 'paste_text_use_dialog' => true, |
| 1560 | 1560 | 'wpeditimage_disable_captions' => $no_captions, |
| 1561 | 1561 | 'plugins' => implode( ',', $plugins ), |
| | 1562 | 'extended_valid_elements' => apply_filters( 'tiny_mce_extended_valid_elements', 'iframe[id|class|title|style|align|frameborder|height|longdesc|marginheight|marginwidth|name|scrolling|src|width]' ), |
| 1562 | 1563 | ); |
| 1563 | 1564 | |
| 1564 | 1565 | if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) { |
diff --git wp-admin/js/editor.dev.js wp-admin/js/editor.dev.js
index cf58279..687f0bf 100644
|
|
|
var switchEditors = { |
| 135 | 135 | }, |
| 136 | 136 | |
| 137 | 137 | _wp_Autop : function(pee) { |
| 138 | | 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]|fieldset|legend|hr'; |
| | 138 | 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]|fieldset|legend|hr|iframe'; |
| 139 | 139 | |
| 140 | 140 | if ( pee.indexOf('<object') != -1 ) { |
| 141 | 141 | pee = pee.replace(/<object[\s\S]+?<\/object>/g, function(a){ |