diff --git a/src/wp-includes/block-editor.php b/src/wp-includes/block-editor.php index 0c8dc72ed9..7205ef2f4a 100644 --- a/src/wp-includes/block-editor.php +++ b/src/wp-includes/block-editor.php @@ -201,23 +201,25 @@ function get_default_block_editor_settings() { } $editor_settings = array( - 'alignWide' => get_theme_support( 'align-wide' ), - 'allowedBlockTypes' => true, - 'allowedMimeTypes' => get_allowed_mime_types(), - 'defaultEditorStyles' => $default_editor_styles, - 'blockCategories' => get_default_block_categories(), - 'disableCustomColors' => get_theme_support( 'disable-custom-colors' ), - 'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ), - 'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ), - 'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ), - 'enableCustomSpacing' => get_theme_support( 'custom-spacing' ), - 'enableCustomUnits' => get_theme_support( 'custom-units' ), - 'isRTL' => is_rtl(), - 'imageDefaultSize' => $image_default_size, - 'imageDimensions' => $image_dimensions, - 'imageEditing' => true, - 'imageSizes' => $available_image_sizes, - 'maxUploadFileSize' => $max_upload_size, + 'alignWide' => get_theme_support( 'align-wide' ), + 'allowedBlockTypes' => true, + 'allowedMimeTypes' => get_allowed_mime_types(), + 'defaultEditorStyles' => $default_editor_styles, + 'blockCategories' => get_default_block_categories(), + 'disableCustomColors' => get_theme_support( 'disable-custom-colors' ), + 'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ), + 'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ), + 'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ), + 'enableCustomSpacing' => get_theme_support( 'custom-spacing' ), + 'enableCustomUnits' => get_theme_support( 'custom-units' ), + 'isRTL' => is_rtl(), + 'imageDefaultSize' => $image_default_size, + 'imageDimensions' => $image_dimensions, + 'imageEditing' => true, + 'imageSizes' => $available_image_sizes, + 'maxUploadFileSize' => $max_upload_size, + // The following flag is required to enable the new Gallery block format on the mobile apps in 5.9. + '__unstableGalleryWithImageBlocks' => true, ); // Theme settings. diff --git a/tests/phpunit/tests/blocks/editor.php b/tests/phpunit/tests/blocks/editor.php index 1f872bf909..a7277d5966 100644 --- a/tests/phpunit/tests/blocks/editor.php +++ b/tests/phpunit/tests/blocks/editor.php @@ -170,7 +170,7 @@ class Tests_Blocks_Editor extends WP_UnitTestCase { public function test_get_default_block_editor_settings() { $settings = get_default_block_editor_settings(); - $this->assertCount( 17, $settings ); + $this->assertCount( 18, $settings ); $this->assertFalse( $settings['alignWide'] ); $this->assertIsArray( $settings['allowedMimeTypes'] ); $this->assertTrue( $settings['allowedBlockTypes'] ); @@ -265,6 +265,7 @@ class Tests_Blocks_Editor extends WP_UnitTestCase { $settings['imageSizes'] ); $this->assertIsInt( $settings['maxUploadFileSize'] ); + $this->assertTrue( $settings['__unstableGalleryWithImageBlocks'] ); } /**