Coding Standards: Apply some minor coding standards adjustments.

Follow up to [50977], [50987], and [50995].

See #41683, #53156, #53175.
Built from https://develop.svn.wordpress.org/trunk@51007


git-svn-id: http://core.svn.wordpress.org/trunk@50616 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2021-05-25 17:43:57 +00:00
parent 212f532d4c
commit 836b5ad7c7
4 changed files with 4 additions and 4 deletions

View File

@ -1018,7 +1018,7 @@ class WP_Theme_JSON {
* @param WP_Theme_JSON $incoming Data to merge.
*/
public function merge( $incoming, $update_or_remove = 'remove' ) {
$incoming_data = $incoming->get_raw_data();
$incoming_data = $incoming->get_raw_data();
$existing_data = $this->theme_json;
// The array_replace_recursive algorithm merges at the leaf level.

View File

@ -252,7 +252,7 @@ if ( ! CUSTOM_TAGS ) {
'align' => true,
'value' => true,
),
'main' => array(
'main' => array(
'align' => true,
'dir' => true,
'lang' => true,

View File

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

View File

@ -22,7 +22,7 @@ class WP_Widget_RSS extends WP_Widget {
* @since 2.8.0
*/
public function __construct() {
$widget_ops = array(
$widget_ops = array(
'description' => __( 'Entries from any RSS or Atom feed.' ),
'customize_selective_refresh' => true,
'show_instance_in_rest' => true,