Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Coding Standards: Rename the `$qtInit` and `$mceInit` variables in `_WP_Editors`. 

This resolves 37 WPCS warnings along the lines of:
{{{
Variable "$qtInit" is not in valid snake_case format, try "$qt_init"
Variable "$mceInit" is not in valid snake_case format, try "$mce_init"
}}}

Follow-up to [18498].

See #57839.
Built from https://develop.svn.wordpress.org/trunk@55648


git-svn-id: http://core.svn.wordpress.org/trunk@55160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-04-12 09:43:21 +00:00
parent ac160bcd14
commit 7478b8d5af
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
wp-includes/class-wp-editor.php
View File

@ -329,21 +329,21 @@ final class _WP_Editors {
if ( self::$this_quicktags ) {
$qtInit = array(
$qt_init = array(
'id' => $editor_id,
'buttons' => '',
);
if ( is_array( $set['quicktags'] ) ) {
$qtInit = array_merge( $qtInit, $set['quicktags'] );
$qt_init = array_merge( $qt_init, $set['quicktags'] );
}
if ( empty( $qtInit['buttons'] ) ) {
$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
if ( empty( $qt_init['buttons'] ) ) {
$qt_init['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
}
if ( $set['_content_editor_dfw'] ) {
$qtInit['buttons'] .= ',dfw';
$qt_init['buttons'] .= ',dfw';
}
/**
@ -351,14 +351,14 @@ final class _WP_Editors {
*
* @since 3.3.0
*
* @param array $qtInit Quicktags settings.
* @param array $qt_init Quicktags settings.
* @param string $editor_id Unique editor identifier, e.g. 'content'.
*/
$qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
$qt_init = apply_filters( 'quicktags_settings', $qt_init, $editor_id );
self::$qt_settings[ $editor_id ] = $qtInit;
self::$qt_settings[ $editor_id ] = $qt_init;
self::$qt_buttons = array_merge( self::$qt_buttons, explode( ',', $qtInit['buttons'] ) );
self::$qt_buttons = array_merge( self::$qt_buttons, explode( ',', $qt_init['buttons'] ) );
}
if ( self::$this_tinymce ) {
@ -753,7 +753,7 @@ final class _WP_Editors {
unset( $set['tinymce']['body_class'] );
}
$mceInit = array(
$mce_init = array(
'selector' => "#$editor_id",
'wpautop' => (bool) $set['wpautop'],
'indent' => ! $set['wpautop'],
@ -766,10 +766,10 @@ final class _WP_Editors {
);
// Merge with the first part of the init array.
$mceInit = array_merge( self::$first_init, $mceInit );
$mce_init = array_merge( self::$first_init, $mce_init );
if ( is_array( $set['tinymce'] ) ) {
$mceInit = array_merge( $mceInit, $set['tinymce'] );
$mce_init = array_merge( $mce_init, $set['tinymce'] );
}
/*
@ -788,10 +788,10 @@ final class _WP_Editors {
* @since 2.7.0
* @since 3.3.0 The `$editor_id` parameter was added.
*
* @param array $mceInit An array with teenyMCE config.
* @param array $mce_init An array with teenyMCE config.
* @param string $editor_id Unique editor identifier, e.g. 'content'.
*/
$mceInit = apply_filters( 'teeny_mce_before_init', $mceInit, $editor_id );
$mce_init = apply_filters( 'teeny_mce_before_init', $mce_init, $editor_id );
} else {
/**
@ -800,19 +800,19 @@ final class _WP_Editors {
* @since 2.5.0
* @since 3.3.0 The `$editor_id` parameter was added.
*
* @param array $mceInit An array with TinyMCE config.
* @param array $mce_init An array with TinyMCE config.
* @param string $editor_id Unique editor identifier, e.g. 'content'. Accepts 'classic-block'
* when called from block editor's Classic block.
*/
$mceInit = apply_filters( 'tiny_mce_before_init', $mceInit, $editor_id );
$mce_init = apply_filters( 'tiny_mce_before_init', $mce_init, $editor_id );
}
if ( empty( $mceInit['toolbar3'] ) && ! empty( $mceInit['toolbar4'] ) ) {
$mceInit['toolbar3'] = $mceInit['toolbar4'];
$mceInit['toolbar4'] = '';
if ( empty( $mce_init['toolbar3'] ) && ! empty( $mce_init['toolbar4'] ) ) {
$mce_init['toolbar3'] = $mce_init['toolbar4'];
$mce_init['toolbar4'] = '';
}
self::$mce_settings[ $editor_id ] = $mceInit;
self::$mce_settings[ $editor_id ] = $mce_init;
} // End if self::$this_tinymce.
}
@ -1567,28 +1567,28 @@ final class _WP_Editors {
public static function editor_js() {
global $tinymce_version;
$tmce_on = ! empty( self::$mce_settings );
$mceInit = '';
$qtInit = '';
$tmce_on = ! empty( self::$mce_settings );
$mce_init = '';
$qt_init = '';
if ( $tmce_on ) {
foreach ( self::$mce_settings as $editor_id => $init ) {
$options = self::_parse_init( $init );
$mceInit .= "'$editor_id':{$options},";
$options = self::_parse_init( $init );
$mce_init .= "'$editor_id':{$options},";
}
$mceInit = '{' . trim( $mceInit, ',' ) . '}';
$mce_init = '{' . trim( $mce_init, ',' ) . '}';
} else {
$mceInit = '{}';
$mce_init = '{}';
}
if ( ! empty( self::$qt_settings ) ) {
foreach ( self::$qt_settings as $editor_id => $init ) {
$options = self::_parse_init( $init );
$qtInit .= "'$editor_id':{$options},";
$options = self::_parse_init( $init );
$qt_init .= "'$editor_id':{$options},";
}
$qtInit = '{' . trim( $qtInit, ',' ) . '}';
$qt_init = '{' . trim( $qt_init, ',' ) . '}';
} else {
$qtInit = '{}';
$qt_init = '{}';
}
$ref = array(
@ -1622,8 +1622,8 @@ final class _WP_Editors {
}
?>
mceInit: <?php echo $mceInit; ?>,
qtInit: <?php echo $qtInit; ?>,
mceInit: <?php echo $mce_init; ?>,
qtInit: <?php echo $qt_init; ?>,
ref: <?php echo self::_parse_init( $ref ); ?>,
load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
};

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.3-alpha-55647';
$wp_version = '6.3-alpha-55648';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.