Changeset 59885

Timestamp:

02/27/2025 11:08:10 PM (13 hours ago)

Author:

peterwilsoncc

Message:

Editor: Set new default rendering mode for Pages.

This update updates the page post-type definition and sets template-locked as the new default rendering mode for the block editor.

Props mamaduka, wildworks, joemcgill, tyb, swissspidy, audrasjb.
Fixes #61811.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/option/networkOption.php (modified) (2 diffs)

trunk/src/wp-includes/post.php

@@ -69 +69 @@
         )
     );
+
+    // Enhance page editor for block themes by rendering template and content blocks.
+    if ( wp_is_block_theme() && current_theme_supports( 'block-templates' ) ) {
+        add_post_type_support( 'page', 'editor', array( 'default-mode' => 'template-locked' ) );
+    }
 
     register_post_type(

trunk/tests/phpunit/tests/option/networkOption.php

@@ -382 +382 @@
      */
     public function test_get_network_option_does_not_use_single_site_notoptions_cache_for_networks() {
+        $network_notoptions_cache_before     = wp_cache_get( '1:notoptions', 'site-options' );
+        $single_site_notoptions_cache_before = wp_cache_get( 'notoptions', 'options' );
+
         get_network_option( 1, 'ticket_61730_notoption' );
 
-        $network_notoptions_cache     = wp_cache_get( '1:notoptions', 'site-options' );
-        $single_site_notoptions_cache = wp_cache_get( 'notoptions', 'options' );
-
-        $this->assertEmpty( $single_site_notoptions_cache, 'Single site notoptions cache should not be set for multisite installs.' );
-        $this->assertIsArray( $network_notoptions_cache, 'Multisite notoptions cache should be set.' );
-        $this->assertArrayHasKey( 'ticket_61730_notoption', $network_notoptions_cache, 'The option should be in the notoptions cache.' );
+        $network_notoptions_cache_after     = wp_cache_get( '1:notoptions', 'site-options' );
+        $single_site_notoptions_cache_after = wp_cache_get( 'notoptions', 'options' );
+
+        $this->assertSame( $single_site_notoptions_cache_before, $single_site_notoptions_cache_after, 'Single site notoptions cache should not change for multisite installs.' );
+        $this->assertNotSame( $network_notoptions_cache_before, $network_notoptions_cache_after, 'Multisite notoptions cache should change.' );
+        $this->assertIsArray( $network_notoptions_cache_after, 'Multisite notoptions cache should be set.' );
+        $this->assertArrayHasKey( 'ticket_61730_notoption', $network_notoptions_cache_after, 'The option should be in the notoptions cache.' );
     }
 
@@ -403 +407 @@
      */
     public function test_delete_network_option_does_not_use_single_site_notoptions_cache_for_networks() {
+        $network_notoptions_cache_before     = wp_cache_get( '1:notoptions', 'site-options' );
+        $single_site_notoptions_cache_before = wp_cache_get( 'notoptions', 'options' );
+
         add_network_option( 1, 'ticket_61730_notoption', 'value' );
         delete_network_option( 1, 'ticket_61730_notoption' );
 
-        $network_notoptions_cache     = wp_cache_get( '1:notoptions', 'site-options' );
-        $single_site_notoptions_cache = wp_cache_get( 'notoptions', 'options' );
-
-        $this->assertEmpty( $single_site_notoptions_cache, 'Single site notoptions cache should not be set for multisite installs.' );
-        $this->assertIsArray( $network_notoptions_cache, 'Multisite notoptions cache should be set.' );
-        $this->assertArrayHasKey( 'ticket_61730_notoption', $network_notoptions_cache, 'The option should be in the notoptions cache.' );
+        $network_notoptions_cache_after     = wp_cache_get( '1:notoptions', 'site-options' );
+        $single_site_notoptions_cache_after = wp_cache_get( 'notoptions', 'options' );
+
+        $this->assertSame( $single_site_notoptions_cache_before, $single_site_notoptions_cache_after, 'Single site notoptions cache should not change for multisite installs.' );
+        $this->assertNotSame( $network_notoptions_cache_before, $network_notoptions_cache_after, 'Multisite notoptions cache should change.' );
+        $this->assertIsArray( $network_notoptions_cache_after, 'Multisite notoptions cache should be set.' );
+        $this->assertArrayHasKey( 'ticket_61730_notoption', $network_notoptions_cache_after, 'The option should be in the notoptions cache.' );
     }
 }