Commit 90d4f10e74 for wordpress.org

commit 90d4f10e7410d6a16d24c0d67aa7a3d0160fcd3d
Author: davidbaumwald <davidbaumwald@git.wordpress.org>
Date:   Tue Sep 17 21:54:13 2024 +0000

    Script Loader: Remove unused array_merge.

    This change removes an unused `array_merge` that was added in [44265].

    Props kkmuffme, SergeyBiryukov, akshat2802.
    Fixes #61754.
    Built from https://develop.svn.wordpress.org/trunk@59033


    git-svn-id: http://core.svn.wordpress.org/trunk@58429 1a063a9b-81f0-0310-95a4-ce76da25c4cd

diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index c9eb40d1c5..9adfb37931 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -609,10 +609,6 @@ function wp_tinymce_inline_scripts() {
 		$tinymce_settings['wpeditimage_disable_captions'] = true;
 	}

-	if ( ! empty( $editor_settings['tinymce'] ) && is_array( $editor_settings['tinymce'] ) ) {
-		array_merge( $tinymce_settings, $editor_settings['tinymce'] );
-	}
-
 	/** This filter is documented in wp-includes/class-wp-editor.php */
 	$tinymce_settings = apply_filters( 'tiny_mce_before_init', $tinymce_settings, 'classic-block' );

diff --git a/wp-includes/version.php b/wp-includes/version.php
index a7e3a9ed79..5a02630db2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-59032';
+$wp_version = '6.7-alpha-59033';

 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.