<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[47027] trunk/src/wp-includes/widgets.php: Coding Standards: Use strict comparison and Yoda conditions in `wp-includes/widgets.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47027">47027</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47027","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-02 11:35:55 +0000 (Thu, 02 Jan 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use strict comparison and Yoda conditions in `wp-includes/widgets.php`.
Props jenilk.
Fixes <a href="https://core.trac.wordpress.org/ticket/49104">#49104</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2020-01-01 03:51:29 UTC (rev 47026)
+++ trunk/src/wp-includes/widgets.php 2020-01-02 11:35:55 UTC (rev 47027)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,7 +674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $index = sanitize_title( $index );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $wp_registered_sidebars as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( sanitize_title( $value['name'] ) == $index ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sanitize_title( $value['name'] ) === $index ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $index = $key;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -876,8 +876,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $widgets ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $widgets as $widget ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $sidebar;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -966,7 +966,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Upgraded list of widgets to version 3 array format when called from the admin.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_sidebars_widgets( $deprecated = true ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $deprecated !== true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true !== $deprecated ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '2.8.1' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1062,7 +1062,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $single = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $settings ) as $number ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'number' == $number ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'number' === $number ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_numeric( $number ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,7 +1088,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $sidebar ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebar as $i => $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $base_name == $name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $base_name === $name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sidebars_widgets[ $index ][ $i ] = "$name-2";
</span><span class="cx" style="display: block; padding: 0 10px"> $changed = true;
</span><span class="cx" style="display: block; padding: 0 10px"> break 2;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1527,7 +1527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $rss->get_items( 0, $items ) as $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = $item->get_link();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( stristr( $link, 'http' ) != $link ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( stristr( $link, 'http' ) !== $link ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = substr( $link, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $link = esc_url( strip_tags( $link ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1545,7 +1545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $summary = $desc;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Change existing [...] to […].
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '[...]' == substr( $summary, -5 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '[...]' === substr( $summary, -5 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $summary = substr( $summary, 0, -5 ) . '[…]';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1570,7 +1570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $link == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $link ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "<li>$title{$date}{$summary}{$author}</li>";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $show_summary ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<li><a class='rsswidget' href='$link'>$title</a>{$date}{$summary}{$author}</li>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1695,7 +1695,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = $rss->get_error_message();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = esc_url( strip_tags( $rss->get_permalink() ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( stristr( $link, 'http' ) != $link ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( stristr( $link, 'http' ) !== $link ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = substr( $link, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>