Changeset 59074

Timestamp:

09/20/2024 02:07:11 PM (6 months ago)

Author:

SergeyBiryukov

Message:

Editor: Restore the merging of TinyMCE settings in wp_tinymce_inline_scripts().

This ensures that the function applies the wp_editor_settings filter and merges the resulting array with the rest of TinyMCE init settings.

Includes a unit test to verify that the settings are merged correctly after adding the assignment of array_merge() result that was missed in the initial commit.

Follow-up to [44265], [59033].

Props kkmuffme, akshat2802, davidbaumwald, SergeyBiryukov.
Fixes #61754.

Location:

trunk

Files:

• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/phpunit/tests/editor/wpTinyMceInlineScripts.php (added)

trunk/src/wp-includes/script-loader.php

@@ -608 +608 @@
     if ( $disable_captions ) {
         $tinymce_settings['wpeditimage_disable_captions'] = true;
+    }
+
+    if ( ! empty( $editor_settings['tinymce'] ) && is_array( $editor_settings['tinymce'] ) ) {
+        $tinymce_settings = array_merge( $tinymce_settings, $editor_settings['tinymce'] );
     }