From 9088bea749fa1c8deee7377a8d6f296776bb1031 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 7 Nov 2019 07:12:06 +0000 Subject: [PATCH] Docs: Make `@param` tags in `mce_buttons` and related filters consistent with the variable names. Props upadalavipul, isabel_brison. Fixes #41456. Built from https://develop.svn.wordpress.org/trunk@46675 git-svn-id: http://core.svn.wordpress.org/trunk@46475 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-editor.php | 23 ++++++++++++----------- wp-includes/version.php | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index f1c7f8439c..be911a94b6 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -577,16 +577,17 @@ final class _WP_Editors { } if ( $set['teeny'] ) { + $mce_buttons = array( 'bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'fullscreen' ); /** * Filters the list of teenyMCE buttons (Text tab). * * @since 2.7.0 * - * @param array $buttons An array of teenyMCE buttons. - * @param string $editor_id Unique editor identifier, e.g. 'content'. + * @param array $mce_buttons An array of teenyMCE buttons. + * @param string $editor_id Unique editor identifier, e.g. 'content'. */ - $mce_buttons = apply_filters( 'teeny_mce_buttons', array( 'bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'fullscreen' ), $editor_id ); + $mce_buttons = apply_filters( 'teeny_mce_buttons', $mce_buttons, $editor_id ); $mce_buttons_2 = array(); $mce_buttons_3 = array(); $mce_buttons_4 = array(); @@ -610,8 +611,8 @@ final class _WP_Editors { * * @since 2.0.0 * - * @param array $buttons First-row list of buttons. - * @param string $editor_id Unique editor identifier, e.g. 'content'. + * @param array $mce_buttons First-row list of buttons. + * @param string $editor_id Unique editor identifier, e.g. 'content'. */ $mce_buttons = apply_filters( 'mce_buttons', $mce_buttons, $editor_id ); @@ -626,8 +627,8 @@ final class _WP_Editors { * * @since 2.0.0 * - * @param array $buttons Second-row list of buttons. - * @param string $editor_id Unique editor identifier, e.g. 'content'. + * @param array $mce_buttons_2 Second-row list of buttons. + * @param string $editor_id Unique editor identifier, e.g. 'content'. */ $mce_buttons_2 = apply_filters( 'mce_buttons_2', $mce_buttons_2, $editor_id ); @@ -636,8 +637,8 @@ final class _WP_Editors { * * @since 2.0.0 * - * @param array $buttons Third-row list of buttons. - * @param string $editor_id Unique editor identifier, e.g. 'content'. + * @param array $mce_buttons_3 Third-row list of buttons. + * @param string $editor_id Unique editor identifier, e.g. 'content'. */ $mce_buttons_3 = apply_filters( 'mce_buttons_3', array(), $editor_id ); @@ -646,8 +647,8 @@ final class _WP_Editors { * * @since 2.5.0 * - * @param array $buttons Fourth-row list of buttons. - * @param string $editor_id Unique editor identifier, e.g. 'content'. + * @param array $mce_buttons_4 Fourth-row list of buttons. + * @param string $editor_id Unique editor identifier, e.g. 'content'. */ $mce_buttons_4 = apply_filters( 'mce_buttons_4', array(), $editor_id ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 3fd9f22ae7..ff79ee6738 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-46674'; +$wp_version = '5.4-alpha-46675'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.