From 836b5ad7c77453d0d5c53f4371ed1fe3c04755f8 Mon Sep 17 00:00:00 2001 From: desrosj Date: Tue, 25 May 2021 17:43:57 +0000 Subject: [PATCH] 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 --- wp-includes/class-wp-theme-json.php | 2 +- wp-includes/kses.php | 2 +- wp-includes/version.php | 2 +- wp-includes/widgets/class-wp-widget-rss.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/class-wp-theme-json.php b/wp-includes/class-wp-theme-json.php index dd7b5c12e7..5aef6f1886 100644 --- a/wp-includes/class-wp-theme-json.php +++ b/wp-includes/class-wp-theme-json.php @@ -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. diff --git a/wp-includes/kses.php b/wp-includes/kses.php index 5310f0caf9..81610e1e9a 100644 --- a/wp-includes/kses.php +++ b/wp-includes/kses.php @@ -252,7 +252,7 @@ if ( ! CUSTOM_TAGS ) { 'align' => true, 'value' => true, ), - 'main' => array( + 'main' => array( 'align' => true, 'dir' => true, 'lang' => true, diff --git a/wp-includes/version.php b/wp-includes/version.php index 592900c449..1d621af242 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -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. diff --git a/wp-includes/widgets/class-wp-widget-rss.php b/wp-includes/widgets/class-wp-widget-rss.php index 0b07fd8101..332ba98d88 100644 --- a/wp-includes/widgets/class-wp-widget-rss.php +++ b/wp-includes/widgets/class-wp-widget-rss.php @@ -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,