From 7dc55e9fbfc514ea7482f7e0c8bce4618f71c9ad Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 16 Dec 2018 22:54:46 +0000 Subject: [PATCH] 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 --- src/wp-admin/includes/post.php | 5 +++++ src/wp-includes/blocks.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php index aba113c7a5..f76f16e625 100644 --- a/src/wp-admin/includes/post.php +++ b/src/wp-admin/includes/post.php @@ -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 ); /** diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index e817286ff7..fe83ef7750 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -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 );