Changeset 47054 for trunk/src/wp-mail.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-mail.php (modified) (4 diffs)

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;
     }