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

PHPCS: Fix errors introduced in [44236]. 

See #45221.
Built from https://develop.svn.wordpress.org/trunk@44238


git-svn-id: http://core.svn.wordpress.org/trunk@44068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-12-17 03:16:12 +00:00
parent 86bff28a19
commit 030b1ba144
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/script-loader.php
View File

@ -530,12 +530,12 @@ function wp_default_packages_inline_scripts( &$scripts ) {
$external_plugins = apply_filters( 'mce_external_plugins', array(), 'classic-block' ); $external_plugins = apply_filters( 'mce_external_plugins', array(), 'classic-block' );
$tinymce_settings = array( $tinymce_settings = array(
'plugins' => implode( ',', $tinymce_plugins ), 'plugins' => implode( ',', $tinymce_plugins ),
'toolbar1' => implode( ',', $toolbar1 ), 'toolbar1' => implode( ',', $toolbar1 ),
'toolbar2' => implode( ',', $toolbar2 ), 'toolbar2' => implode( ',', $toolbar2 ),
'toolbar3' => implode( ',', $toolbar3 ), 'toolbar3' => implode( ',', $toolbar3 ),
'toolbar4' => implode( ',', $toolbar4 ), 'toolbar4' => implode( ',', $toolbar4 ),
'external_plugins' => wp_json_encode( $external_plugins ), 'external_plugins' => wp_json_encode( $external_plugins ),
'classic_block_editor' => true, 'classic_block_editor' => true,
); );
@ -547,7 +547,7 @@ function wp_default_packages_inline_scripts( &$scripts ) {
$init_obj = ''; $init_obj = '';
foreach ( $tinymce_settings as $key => $value ) { foreach ( $tinymce_settings as $key => $value ) {
if ( is_bool( $value ) ) { if ( is_bool( $value ) ) {
$val = $value ? 'true' : 'false'; $val = $value ? 'true' : 'false';
$init_obj .= $key . ':' . $val . ','; $init_obj .= $key . ':' . $val . ',';
continue; continue;
} elseif ( ! empty( $value ) && is_string( $value ) && ( } elseif ( ! empty( $value ) && is_string( $value ) && (

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1-alpha-44237'; $wp_version = '5.1-alpha-44238';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.