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

Coding Standards: Use strict comparison in `wp-admin/widgets.php`. 

Props jenilk.
Fixes #49000.
Built from https://develop.svn.wordpress.org/trunk@46964


git-svn-id: http://core.svn.wordpress.org/trunk@46764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-12-16 12:55:03 +00:00
parent 5b9fd2d7e7
commit 8894c0f1a2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/widgets.php
View File

@ -24,11 +24,11 @@ $widgets_access = get_user_setting( 'widgets_access' );
if ( isset( $_GET['widgets-access'] ) ) { if ( isset( $_GET['widgets-access'] ) ) {
check_admin_referer( 'widgets-access' ); check_admin_referer( 'widgets-access' );
$widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off'; $widgets_access = 'on' === $_GET['widgets-access'] ? 'on' : 'off';
set_user_setting( 'widgets_access', $widgets_access ); set_user_setting( 'widgets_access', $widgets_access );
} }
if ( 'on' == $widgets_access ) { if ( 'on' === $widgets_access ) {
add_filter( 'admin_body_class', 'wp_widgets_access_body_class' ); add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
} else { } else {
wp_enqueue_script( 'admin-widgets' ); wp_enqueue_script( 'admin-widgets' );
@ -96,7 +96,7 @@ if ( empty( $sidebars_widgets ) ) {
} }
foreach ( $sidebars_widgets as $sidebar_id => $widgets ) { foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
if ( 'wp_inactive_widgets' == $sidebar_id ) { if ( 'wp_inactive_widgets' === $sidebar_id ) {
continue; continue;
} }
@ -188,7 +188,7 @@ if ( isset( $_POST['savewidget'] ) || isset( $_POST['removewidget'] ) ) {
$_POST['widget-id'] = $sidebar; $_POST['widget-id'] = $sidebar;
foreach ( (array) $wp_registered_widget_updates as $name => $control ) { foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
if ( $name != $id_base || ! is_callable( $control['callback'] ) ) { if ( $name !== $id_base || ! is_callable( $control['callback'] ) ) {
continue; continue;
} }
@ -316,7 +316,7 @@ if ( isset( $_GET['editwidget'] ) && $_GET['editwidget'] ) {
<?php <?php
foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) { foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>"; echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) { if ( 'wp_inactive_widgets' === $sbname || 'orphaned_widgets' === substr( $sbname, 0, 16 ) ) {
echo '&nbsp;'; echo '&nbsp;';
} else { } else {
if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) { if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
@ -456,13 +456,13 @@ do_action( 'widgets_admin_page' );
$theme_sidebars = array(); $theme_sidebars = array();
foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) { foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) { if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
$wrap_class = 'widgets-holder-wrap'; $wrap_class = 'widgets-holder-wrap';
if ( ! empty( $registered_sidebar['class'] ) ) { if ( ! empty( $registered_sidebar['class'] ) ) {
$wrap_class .= ' ' . $registered_sidebar['class']; $wrap_class .= ' ' . $registered_sidebar['class'];
} }
$is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id']; $is_inactive_widgets = 'wp_inactive_widgets' === $registered_sidebar['id'];
?> ?>
<div class="<?php echo esc_attr( $wrap_class ); ?>"> <div class="<?php echo esc_attr( $wrap_class ); ?>">
<div class="widget-holder inactive"> <div class="widget-holder inactive">
@ -510,7 +510,7 @@ $single_sidebar_class = '';
$sidebars_count = count( $theme_sidebars ); $sidebars_count = count( $theme_sidebars );
if ( $sidebars_count > 1 ) { if ( $sidebars_count > 1 ) {
$split = ceil( $sidebars_count / 2 ); $split = (int) ceil( $sidebars_count / 2 );
} else { } else {
$single_sidebar_class = ' single-sidebar'; $single_sidebar_class = ' single-sidebar';
} }
@ -531,7 +531,7 @@ foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
$wrap_class .= ' closed'; $wrap_class .= ' closed';
} }
if ( $split && $i == $split ) { if ( $split && $i === $split ) {
?> ?>
</div><div class="sidebars-column-2"> </div><div class="sidebars-column-2">
<?php <?php

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-46963'; $wp_version = '5.4-alpha-46964';
/** /**
* 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.