sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Fix tests broken in PHP 5.x after [43879]. 

Props pento.
Merges [43883] to trunk.
See #45290.

git-svn-id: https://develop.svn.wordpress.org/trunk@44242 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2018-12-16 22:54:46 +00:00
parent 8002325c92
commit 7dc55e9fbf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-admin/includes/post.php
View File

@ -2045,6 +2045,11 @@ function use_block_editor_for_post( $post ) {
return false;
}
// The posts page can't be edited in the block editor.
if ( absint( get_option( 'page_for_posts' ) ) === $post->ID && empty( $post->post_content ) ) {
return false;
}
$use_block_editor = use_block_editor_for_post_type( $post->post_type );
/**

2
src/wp-includes/blocks.php
View File

@ -222,7 +222,7 @@ function do_blocks( $content ) {
*/
function _restore_wpautop_hook( $content ) {
global $wp_filter;
$current_priority = $wp_filter['the_content']->current_priority();
$current_priority = has_filter( 'the_content', '_restore_wpautop_hook' );
add_filter( 'the_content', 'wpautop', $current_priority - 1 );
remove_filter( 'the_content', '_restore_wpautop_hook', $current_priority );