From a380cdd21a2f12bda1c85c2b892e7f2e2e8abebe Mon Sep 17 00:00:00 2001
From: gziolo <gziolo@git.wordpress.org>
Date: Mon, 24 May 2021 10:23:56 +0000
Subject: [PATCH] Editor: Remove unused param in
 `get_default_block_editor_settings`

Follow-up for [50776].

Props nosolosw.
See #52920.



Built from https://develop.svn.wordpress.org/trunk@50963


git-svn-id: http://core.svn.wordpress.org/trunk@50572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/block-editor.php | 2 +-
 wp-includes/version.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php
index 814433f278..542fc99d2c 100644
--- a/wp-includes/block-editor.php
+++ b/wp-includes/block-editor.php
@@ -235,7 +235,7 @@ function get_default_block_editor_settings() {
  */
 function get_block_editor_settings( $editor_name, $custom_settings = array() ) {
 	$editor_settings = array_merge(
-		get_default_block_editor_settings( $editor_name ),
+		get_default_block_editor_settings(),
 		array(
 			'allowedBlockTypes' => get_allowed_block_types( $editor_name ),
 			'blockCategories'   => get_block_categories( $editor_name ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 11608da80b..adfe01cc77 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-50962';
+$wp_version = '5.8-alpha-50963';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.