Enable customizer legacy widgets only if set (#16956)

* Enable customizer legacy widgets only if set * Only add control if experiment enabled. * Remove unnecessary repetition
WordPress · Sep 3, 2019 · a400f7b · a400f7b
1 parent 6a06143
commit a400f7b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/lib/customizer.php b/lib/customizer.php
@@ -55,20 +55,22 @@ function gutenberg_customize_register( $wp_customize ) {
 			'sanitize_callback' => 'gutenberg_customize_sanitize',
 		)
 	);
-	$wp_customize->add_section(
-		'gutenberg_widget_blocks',
-		array( 'title' => __( 'Widget Blocks (Experimental)', 'gutenberg' ) )
-	);
-	$wp_customize->add_control(
-		new WP_Customize_Widget_Blocks_Control(
-			$wp_customize,
+	if ( get_option( 'gutenberg-experiments' ) && array_key_exists( 'gutenberg-widget-experiments', get_option( 'gutenberg-experiments' ) ) ) {
+		$wp_customize->add_section(
 			'gutenberg_widget_blocks',
-			array(
-				'section'  => 'gutenberg_widget_blocks',
-				'settings' => 'gutenberg_widget_blocks',
+			array( 'title' => __( 'Widget Blocks (Experimental)', 'gutenberg' ) )
+		);
+		$wp_customize->add_control(
+			new WP_Customize_Widget_Blocks_Control(
+				$wp_customize,
+				'gutenberg_widget_blocks',
+				array(
+					'section'  => 'gutenberg_widget_blocks',
+					'settings' => 'gutenberg_widget_blocks',
+				)
 			)
-		)
-	);
+		);
+	}
 }
 add_action( 'customize_register', 'gutenberg_customize_register' );
 

diff --git a/lib/widgets-page.php b/lib/widgets-page.php
@@ -97,7 +97,7 @@ function gutenberg_widgets_init( $hook ) {
 				wp.editWidgets.%s( "widgets-editor", %s );
 			} );',
 			$initializer_name,
-			wp_json_encode( $settings )
+			wp_json_encode( gutenberg_experiments_editor_settings( $settings ) )
 		)
 	);
 

diff --git a/packages/edit-widgets/src/index.js b/packages/edit-widgets/src/index.js
@@ -40,6 +40,9 @@ export function initialize( id, settings ) {
  */
 export function customizerInitialize( id, settings ) {
 	registerCoreBlocks();
+	if ( process.env.GUTENBERG_PHASE === 2 ) {
+		__experimentalRegisterExperimentalCoreBlocks( settings );
+	}
 	render(
 		<CustomizerEditWidgetsInitializer
 			settings={ settings }