mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-05-04 19:08:04 +02:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Coding Standards: Apply some minor coding standards adjustments.

Browse Source 
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
This commit is contained in:
Jonathan Desrosiers 2021-05-25 17:42:58 +00:00
parent 333f10ba1c
commit c622c4badd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/class-wp-theme-json.php
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.

2
src/wp-includes/kses.php
View File

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

2
src/wp-includes/widgets/class-wp-widget-rss.php
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,