Changeset 44809 for trunk/src/wp-includes/ms-functions.php

Timestamp:

03/07/2019 09:11:37 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Reduce explicit local current_time( 'timestamp' ) usage in favor of native PHP functions.

Timestamps don't carry any timezone information, using the intended format directly simplifies the logic and makes the code less confusing.

Props Rarst, jdgrimes.
See #40657.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (3 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -519 +519 @@
     if ( $signup != null ) {
         $registered_at = mysql2date( 'U', $signup->registered );
-        $now           = current_time( 'timestamp', true );
+        $now           = time();
         $diff          = $now - $registered_at;
         // If registered more than two days ago, cancel registration and let this signup go through.
@@ -531 +531 @@
     $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email ) );
     if ( $signup != null ) {
-        $diff = current_time( 'timestamp', true ) - mysql2date( 'U', $signup->registered );
+        $diff = time() - mysql2date( 'U', $signup->registered );
         // If registered more than two days ago, cancel registration and let this signup go through.
         if ( $diff > 2 * DAY_IN_SECONDS ) {
@@ -689 +689 @@
     $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path ) ); // TODO: Check email too?
     if ( ! empty( $signup ) ) {
-        $diff = current_time( 'timestamp', true ) - mysql2date( 'U', $signup->registered );
+        $diff = time() - mysql2date( 'U', $signup->registered );
         // If registered more than two days ago, cancel registration and let this signup go through.
         if ( $diff > 2 * DAY_IN_SECONDS ) {