Changeset 52349

Timestamp:

12/09/2021 03:23:23 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Editor: Add an editor settings flag to enable the new gallery for mobile apps for 5.9.

Currently the WordPress mobile apps rely on the __unstableGalleryWithImageBlocks flag being set in order to enable the new gallery block format.

This commit includes the value in the get_default_block_editor_settings() function in order to ensure that versions of the mobile app >= 18.2 will be able to add and edit gallery blocks in the new format.

Props glendaviesnz, ocean90, hellofromTonya, noisysocks.
Fixes #54583.

Location:

trunk

Files:

• src/wp-includes/block-editor.php (modified) (1 diff)
• tests/phpunit/tests/blocks/editor.php (modified) (2 diffs)

trunk/src/wp-includes/block-editor.php

@@ -202 +202 @@
 
         $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,
         );
 

trunk/tests/phpunit/tests/blocks/editor.php

@@ -171 +171 @@
                 $settings = get_default_block_editor_settings();
 
-                $this->assertCount( 17, $settings );
+                $this->assertCount( 18, $settings );
                 $this->assertFalse( $settings['alignWide'] );
                 $this->assertIsArray( $settings['allowedMimeTypes'] );
@@ -266 +266 @@
                 );
                 $this->assertIsInt( $settings['maxUploadFileSize'] );
+                $this->assertTrue( $settings['__unstableGalleryWithImageBlocks'] );
         }