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 and Yoda conditions in `wp-includes/widgets.php`. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@46827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-01-02 11:37:05 +00:00
parent 3fe8bdfca7
commit b9353dbf70
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

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

20
wp-includes/widgets.php
View File

@ -674,7 +674,7 @@ function dynamic_sidebar( $index = 1 ) {
} else { } else {
$index = sanitize_title( $index ); $index = sanitize_title( $index );
foreach ( (array) $wp_registered_sidebars as $key => $value ) { foreach ( (array) $wp_registered_sidebars as $key => $value ) {
if ( sanitize_title( $value['name'] ) == $index ) { if ( sanitize_title( $value['name'] ) === $index ) {
$index = $key; $index = $key;
break; break;
} }
@ -876,8 +876,8 @@ function is_active_widget( $callback = false, $widget_id = false, $id_base = fal
if ( is_array( $widgets ) ) { if ( is_array( $widgets ) ) {
foreach ( $widgets as $widget ) { foreach ( $widgets as $widget ) {
if ( ( $callback && isset( $wp_registered_widgets[ $widget ]['callback'] ) && $wp_registered_widgets[ $widget ]['callback'] == $callback ) || ( $id_base && _get_widget_id_base( $widget ) == $id_base ) ) { if ( ( $callback && isset( $wp_registered_widgets[ $widget ]['callback'] ) && $wp_registered_widgets[ $widget ]['callback'] === $callback ) || ( $id_base && _get_widget_id_base( $widget ) === $id_base ) ) {
if ( ! $widget_id || $widget_id == $wp_registered_widgets[ $widget ]['id'] ) { if ( ! $widget_id || $widget_id === $wp_registered_widgets[ $widget ]['id'] ) {
return $sidebar; return $sidebar;
} }
} }
@ -966,7 +966,7 @@ function is_active_sidebar( $index ) {
* @return array Upgraded list of widgets to version 3 array format when called from the admin. * @return array Upgraded list of widgets to version 3 array format when called from the admin.
*/ */
function wp_get_sidebars_widgets( $deprecated = true ) { function wp_get_sidebars_widgets( $deprecated = true ) {
if ( $deprecated !== true ) { if ( true !== $deprecated ) {
_deprecated_argument( __FUNCTION__, '2.8.1' ); _deprecated_argument( __FUNCTION__, '2.8.1' );
} }
@ -1062,7 +1062,7 @@ function wp_convert_widget_settings( $base_name, $option_name, $settings ) {
$single = true; $single = true;
} else { } else {
foreach ( array_keys( $settings ) as $number ) { foreach ( array_keys( $settings ) as $number ) {
if ( 'number' == $number ) { if ( 'number' === $number ) {
continue; continue;
} }
if ( ! is_numeric( $number ) ) { if ( ! is_numeric( $number ) ) {
@ -1088,7 +1088,7 @@ function wp_convert_widget_settings( $base_name, $option_name, $settings ) {
foreach ( (array) $sidebars_widgets as $index => $sidebar ) { foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
if ( is_array( $sidebar ) ) { if ( is_array( $sidebar ) ) {
foreach ( $sidebar as $i => $name ) { foreach ( $sidebar as $i => $name ) {
if ( $base_name == $name ) { if ( $base_name === $name ) {
$sidebars_widgets[ $index ][ $i ] = "$name-2"; $sidebars_widgets[ $index ][ $i ] = "$name-2";
$changed = true; $changed = true;
break 2; break 2;
@ -1527,7 +1527,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
echo '<ul>'; echo '<ul>';
foreach ( $rss->get_items( 0, $items ) as $item ) { foreach ( $rss->get_items( 0, $items ) as $item ) {
$link = $item->get_link(); $link = $item->get_link();
while ( stristr( $link, 'http' ) != $link ) { while ( stristr( $link, 'http' ) !== $link ) {
$link = substr( $link, 1 ); $link = substr( $link, 1 );
} }
$link = esc_url( strip_tags( $link ) ); $link = esc_url( strip_tags( $link ) );
@ -1545,7 +1545,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
$summary = $desc; $summary = $desc;
// Change existing [...] to [&hellip;]. // Change existing [...] to [&hellip;].
if ( '[...]' == substr( $summary, -5 ) ) { if ( '[...]' === substr( $summary, -5 ) ) {
$summary = substr( $summary, 0, -5 ) . '[&hellip;]'; $summary = substr( $summary, 0, -5 ) . '[&hellip;]';
} }
@ -1570,7 +1570,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
} }
} }
if ( $link == '' ) { if ( '' === $link ) {
echo "<li>$title{$date}{$summary}{$author}</li>"; echo "<li>$title{$date}{$summary}{$author}</li>";
} elseif ( $show_summary ) { } elseif ( $show_summary ) {
echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$summary}{$author}</li>"; echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$summary}{$author}</li>";
@ -1695,7 +1695,7 @@ function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
$error = $rss->get_error_message(); $error = $rss->get_error_message();
} else { } else {
$link = esc_url( strip_tags( $rss->get_permalink() ) ); $link = esc_url( strip_tags( $rss->get_permalink() ) );
while ( stristr( $link, 'http' ) != $link ) { while ( stristr( $link, 'http' ) !== $link ) {
$link = substr( $link, 1 ); $link = substr( $link, 1 );
} }