Changeset 44242

Timestamp:

12/16/2018 10:54:46 PM (6 years ago)

Author:

SergeyBiryukov

Message:

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

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/post.php (modified) (1 diff)
• src/wp-includes/blocks.php (modified) (1 diff)

trunk/src/wp-admin/includes/post.php

@@ -2043 +2043 @@
     if ( isset( $_GET['meta-box-loader'] ) ) {
         check_admin_referer( 'meta-box-loader' );
+        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;
     }

trunk/src/wp-includes/blocks.php

@@ -223 +223 @@
 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 );