Changeset 47054

Timestamp:

01/09/2020 12:53:29 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison and Yoda conditions in the root directory files.

Props pikamander2.
Fixes #48965.

Location:

trunk/src

Files:

• wp-activate.php (modified) (6 diffs)
• wp-cron.php (modified) (3 diffs)
• wp-links-opml.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)
• wp-mail.php (modified) (4 diffs)
• wp-signup.php (modified) (2 diffs)

trunk/src/wp-activate.php

@@ -38 +38 @@
         $redirect_url = remove_query_arg( 'key' );
 
-        if ( $redirect_url !== remove_query_arg( false ) ) {
+        if ( remove_query_arg( false ) !== $redirect_url ) {
                 setcookie( $activate_cookie, $key, 0, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
                 wp_safe_redirect( $redirect_url );
@@ -47 +47 @@
 }
 
-if ( $result === null && isset( $_COOKIE[ $activate_cookie ] ) ) {
+if ( null === $result && isset( $_COOKIE[ $activate_cookie ] ) ) {
         $key    = $_COOKIE[ $activate_cookie ];
         $result = wpmu_activate_signup( $key );
@@ -53 +53 @@
 }
 
-if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
+if ( null === $result || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
         status_header( 404 );
 } elseif ( is_wp_error( $result ) ) {
@@ -143 +143 @@
                         <?php
                         echo '<p class="lead-in">';
-                        if ( $signup->domain . $signup->path == '' ) {
+                        if ( '' === $signup->domain . $signup->path ) {
                                 printf(
                                         /* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */
@@ -163 +163 @@
                         }
                         echo '</p>';
-                } elseif ( $result === null || is_wp_error( $result ) ) {
+                } elseif ( null === $result || is_wp_error( $result ) ) {
                         ?>
                         <h2><?php _e( 'An error occurred during the activation' ); ?></h2>
@@ -182 +182 @@
 
                         <?php
-                        if ( $url && $url != network_home_url( '', 'http' ) ) :
+                        if ( $url && network_home_url( '', 'http' ) !== $url ) :
                                 switch_to_blog( (int) $result['blog_id'] );
                                 $login_url = wp_login_url();

trunk/src/wp-cron.php

@@ -106 +106 @@
  * must match $doing_wp_cron (the "key").
  */
-if ( $doing_cron_transient != $doing_wp_cron ) {
+if ( $doing_cron_transient !== $doing_wp_cron ) {
         return;
 }
@@ -139 +139 @@
 
                         // If the hook ran too long and another cron process stole the lock, quit.
-                        if ( _get_cron_lock() != $doing_wp_cron ) {
+                        if ( _get_cron_lock() !== $doing_wp_cron ) {
                                 return;
                         }
@@ -146 +146 @@
 }
 
-if ( _get_cron_lock() == $doing_wp_cron ) {
+if ( _get_cron_lock() === $doing_wp_cron ) {
         delete_transient( 'doing_cron' );
 }

trunk/src/wp-links-opml.php

@@ -83 +83 @@
 <outline text="<?php echo esc_attr( $title ); ?>" type="link" xmlUrl="<?php echo esc_attr( $bookmark->link_rss ); ?>" htmlUrl="<?php echo esc_attr( $bookmark->link_url ); ?>" updated="
                                                         <?php
-                                                        if ( '0000-00-00 00:00:00' != $bookmark->link_updated ) {
+                                                        if ( '0000-00-00 00:00:00' !== $bookmark->link_updated ) {
                                                                 echo $bookmark->link_updated;}
                                                         ?>

trunk/src/wp-login.php

@@ -524 +524 @@
 setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
 
-if ( SITECOOKIEPATH != COOKIEPATH ) {
+if ( SITECOOKIEPATH !== COOKIEPATH ) {
         setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
 }
@@ -933 +933 @@
                 $errors = new WP_Error();
 
-                if ( isset( $_POST['pass1'] ) && $_POST['pass1'] != $_POST['pass2'] ) {
+                if ( isset( $_POST['pass1'] ) && $_POST['pass1'] !== $_POST['pass2'] ) {
                         $errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
                 }

trunk/src/wp-mail.php

@@ -102 +102 @@
                                 $content_transfer_encoding = $content_transfer_encoding[0];
                         }
-                        if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' == $boundary ) ) {
+                        if ( ( 'multipart/alternative' === $content_type ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' === $boundary ) ) {
                                 $boundary = trim( $line );
                                 $boundary = explode( '"', $boundary );
@@ -143 +143 @@
 
                         if ( preg_match( '/Date: /i', $line ) ) { // of the form '20 Mar 2002 20:32:37 +0100'
-                                $ddate         = str_replace( 'Date: ', '', trim( $line ) );
-                                $ddate         = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate ); // remove parenthesised timezone string if it exists, as this confuses strtotime
-                                $ddate_U       = strtotime( $ddate );
-                                $post_date     = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference );
-                                $post_date_gmt = gmdate( 'Y-m-d H:i:s', $ddate_U );
+                                $ddate           = str_replace( 'Date: ', '', trim( $line ) );
+                                $ddate           = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate ); // remove parenthesised timezone string if it exists, as this confuses strtotime
+                                $ddate_timestamp = strtotime( $ddate );
+                                $post_date       = gmdate( 'Y-m-d H:i:s', $ddate_timestamp + $time_difference );
+                                $post_date_gmt   = gmdate( 'Y-m-d H:i:s', $ddate_timestamp );
                         }
                 }
@@ -163 +163 @@
         $subject = trim( $subject );
 
-        if ( $content_type == 'multipart/alternative' ) {
+        if ( 'multipart/alternative' === $content_type ) {
                 $content = explode( '--' . $boundary, $content );
                 $content = $content[2];
@@ -213 +213 @@
         $post_title = xmlrpc_getposttitle( $content );
 
-        if ( $post_title == '' ) {
+        if ( '' === $post_title ) {
                 $post_title = $subject;
         }

trunk/src/wp-signup.php

@@ -190 +190 @@
                 $blog_public_on_checked  = '';
                 $blog_public_off_checked = '';
-        if ( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) {
+        if ( isset( $_POST['blog_public'] ) && '0' === $_POST['blog_public'] ) {
                 $blog_public_off_checked = 'checked="checked"';
         } else {
@@ -642 +642 @@
         }
 
-        if ( 'blog' == $_POST['signup_for'] ) {
+        if ( 'blog' === $_POST['signup_for'] ) {
                 signup_blog( $user_name, $user_email );
                 return false;