Skip to content

Commit

Permalink
Coding Standards: Apply some minor coding standards adjustments.
Browse files Browse the repository at this point in the history
Follow up to [50977], [50987], and [50995].

See #41683, #53156, #53175.

git-svn-id: https://develop.svn.wordpress.org/trunk@51007 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
desrosj committed May 25, 2021
1 parent 333f10b commit c622c4b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/wp-includes/class-wp-theme-json.php
Expand Up @@ -1018,7 +1018,7 @@ private static function get_style_nodes( $theme_json, $selectors = array() ) {
* @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.
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/kses.php
Expand Up @@ -252,7 +252,7 @@
'align' => true,
'value' => true,
),
'main' => array(
'main' => array(
'align' => true,
'dir' => true,
'lang' => true,
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/widgets/class-wp-widget-rss.php
Expand Up @@ -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,
Expand Down

0 comments on commit c622c4b

Please sign in to comment.