Changeset 11019

Timestamp:

08/19/2016 06:18:07 PM (8 years ago)

Author:

r-a-y

Message:

Core: Remove redundant strtotime() calls.

See #5781.

Location:

trunk

Files:

• src/bp-core/bp-core-functions.php (modified) (2 diffs)
• src/bp-groups/bp-groups-template.php (modified) (2 diffs)
• src/bp-members/bp-members-template.php (modified) (1 diff)
• src/bp-xprofile/bp-xprofile-activity.php (modified) (1 diff)
• tests/phpunit/testcases/core/functions.php (modified) (1 diff)

trunk/src/bp-core/bp-core-functions.php

@@ -1443 +1443 @@
 
     // Get current time.
-    $current_time = bp_core_current_time();
+    $current_time = bp_core_current_time( true, 'timestamp' );
 
     // Use this action to detect the very first activity for a given member.
@@ -1461 +1461 @@
 
     // If it's been more than 5 minutes, record a newer last-activity time.
-    if ( empty( $activity ) || ( strtotime( $current_time ) >= strtotime( '+5 minutes', $activity ) ) ) {
+    if ( empty( $activity ) || ( $current_time >= strtotime( '+5 minutes', $activity ) ) ) {
         bp_update_user_last_activity( $user_id, $current_time );
     }

trunk/src/bp-groups/bp-groups-template.php

@@ -1118 +1118 @@
          * @param object $group Group object.
          */
-        return apply_filters( 'bp_get_group_date_created', bp_core_time_since( strtotime( $group->date_created ) ), $group );
+        return apply_filters( 'bp_get_group_date_created', bp_core_time_since( $group->date_created ), $group );
     }
 
@@ -5435 +5435 @@
      * @param string $value Formatted time since membership was requested.
      */
-    echo apply_filters( 'bp_group_request_time_since_requested', sprintf( __( 'requested %s', 'buddypress' ), bp_core_time_since( strtotime( $requests_template->request->date_modified ) ) ) );
+    echo apply_filters( 'bp_group_request_time_since_requested', sprintf( __( 'requested %s', 'buddypress' ), bp_core_time_since( $requests_template->request->date_modified ) ) );
 }
 

trunk/src/bp-members/bp-members-template.php

@@ -611 +611 @@
 
             // Calculate some times.
-            $current_time  = strtotime( bp_core_current_time() );
+            $current_time  = bp_core_current_time( true, 'timestamp' );
             $last_activity = strtotime( $members_template->member->last_activity );
             $still_online  = strtotime( '+5 minutes', $last_activity );

trunk/src/bp-xprofile/bp-xprofile-activity.php

@@ -308 +308 @@
         $throttle_period = apply_filters( 'bp_xprofile_updated_profile_activity_throttle_time', HOUR_IN_SECONDS * 2 );
         $then            = strtotime( $existing['activities'][0]->date_recorded );
-        $now             = strtotime( bp_core_current_time() );
+        $now             = bp_core_current_time( true, 'timestamp' );
 
         // Bail if throttled.

trunk/tests/phpunit/testcases/core/functions.php

@@ -601 +601 @@
 
     /**
+     * @group bp_core_time_since
+     */
+    public function test_bp_core_time_since_mysql_and_unix_timestamp_return_same_value() {
+        $mysql_date   = '2008-03-25 17:13:55';
+
+        $ts_mysql     = bp_core_time_since( $mysql_date );
+        $ts_timestamp = bp_core_time_since( strtotime( $mysql_date ) );
+
+        $this->assertSame( $ts_mysql, $ts_timestamp );
+    }
+
+    /**
      * @group bp_attachments
      * @group bp_upload_dir