WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PressThis: when the Text editor is the default, run the initial textarea content through pre_wpautop() to convert the paragraph tags. Fixes #29081. 

Built from https://develop.svn.wordpress.org/trunk@29334


git-svn-id: http://core.svn.wordpress.org/trunk@29114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-08-01 00:55:15 +00:00
parent d15f9617f9
commit 8253a54416
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/press-this.php
View File

@ -439,6 +439,8 @@ var photostorage = false;
}
}
jQuery(document).ready(function($) {
var $contnet = $( '#content' );
// Resize screen.
window.resizeTo(760,580);
@ -460,6 +462,12 @@ var photostorage = false;
$('#tagsdiv-post_tag, #categorydiv').children('h3, .handlediv').click(function(){
$(this).siblings('.inside').toggle();
});
if ( $( '#wp-content-wrap' ).hasClass( 'html-active' ) && window.switchEditors &&
( tinyMCEPreInit.mceInit.content && tinyMCEPreInit.mceInit.content.wpautop ) ) {
// The Text editor is default, run the initial content through pre_wpautop() to convert the paragraphs
$contnet.text( window.switchEditors.pre_wpautop( $contnet.text() ) );
}
});
</script>
</head>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.0-beta2-20140731';
$wp_version = '4.0-beta2-20140801';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.