Move gutenberg-block-directory experiment check out of the action

WordPress · Oct 16, 2019 · 77d80f1 · 77d80f1
1 parent 79edc4f
commit 77d80f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/block-directory.php b/lib/block-directory.php
@@ -5,16 +5,15 @@
  * @package gutenberg
  */
 
-if ( ! has_action( 'admin_enqueue_scripts', 'enqueue_block_editor_assets_block_directory' ) ) {
+if (
+	gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ) &&
+	! has_action( 'admin_enqueue_scripts', 'enqueue_block_editor_assets_block_directory' )
+) {
 	/**
 	 * Function responsible for enqueuing the assets required
 	 * for the block directory functionality in the editor.
 	 */
 	function gutenberg_enqueue_block_editor_assets_block_directory() {
-		if ( ! gutenberg_is_experiment_enabled( 'gutenberg-block-directory' ) ) {
-			return;
-		}
-
 		wp_enqueue_script( 'wp-block-directory' );
 		wp_enqueue_style( 'wp-block-directory' );
 	}

diff --git a/lib/client-assets.php b/lib/client-assets.php
@@ -409,7 +409,7 @@ function gutenberg_enqueue_block_editor_assets() {
 		sprintf(
 			'wp.apiFetch.nonceMiddleware = wp.apiFetch.createNonceMiddleware( "%s" );' .
 			'wp.apiFetch.use( wp.apiFetch.nonceMiddleware );' .
-			'wp.apiFetch.nonceEndpoint = "%s";',
+			'wp.apiFetch.nonceEndpoint = "%s";' .
 			'wp.apiFetch.use( wp.apiFetch.mediaUploadMiddleware );',
 			( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
 			admin_url( 'admin-ajax.php?action=gutenberg_rest_nonce' )