Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Props pento.
Merges [43883] to trunk.
See #45290.
Built from https://develop.svn.wordpress.org/trunk@44242


git-svn-id: http://core.svn.wordpress.org/trunk@44072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-12-17 03:19:38 +00:00
parent 7f8d6eccd0
commit 659ca2bd1e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2045,6 +2045,11 @@ function use_block_editor_for_post( $post ) {
return false; 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 ); $use_block_editor = use_block_editor_for_post_type( $post->post_type );
/** /**

2
wp-includes/blocks.php
View File

@ -222,7 +222,7 @@ function do_blocks( $content ) {
*/ */
function _restore_wpautop_hook( $content ) { function _restore_wpautop_hook( $content ) {
global $wp_filter; 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 ); add_filter( 'the_content', 'wpautop', $current_priority - 1 );
remove_filter( 'the_content', '_restore_wpautop_hook', $current_priority ); remove_filter( 'the_content', '_restore_wpautop_hook', $current_priority );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1-alpha-44241'; $wp_version = '5.1-alpha-44242';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.