Changeset 47054 for trunk/src/wp-activate.php

Timestamp:

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

Author:

SergeyBiryukov

Message:

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

Props pikamander2.
Fixes #48965.

File:

• trunk/src/wp-activate.php (modified) (6 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();