Changeset 8676

Timestamp:

07/23/2014 06:07:39 PM (10 years ago)

Author:

r-a-y

Message:

Fix issues with bp_core_time_since().

Previously, when the $newer_date parameter isn't passed, we generated a
UNIX timestamp using strtotime() and bp_core_current_time(). strtotime()
uses the default timezone, which can cause timezone discrepencies if the
server time is not UTC.

This commit removes the strtotime() usage and refactors bp_core_current_time()
to accept current_time()'s 'type' parameter. This allows us to correctly
grab the UTC timestamp when setting bp_core_current_time()'s second
argument to 'timestamp'.

Commit also adds some unit tests.

Fixes #4310.

Location:

trunk

Files:

• src/bp-core/bp-core-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/core/functions.php (modified) (1 diff)

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

@@ -772 +772 @@
  *
  * @param bool $gmt True to use GMT (rather than local) time. Default: true.
+ * @param string $type See the 'type' parameter in {@link current_time()}.
+          Default: 'mysql'.
  * @return string Current time in 'Y-m-d h:i:s' format.
  */
-function bp_core_current_time( $gmt = true ) {
-    // Get current time in MYSQL format
-    $current_time = current_time( 'mysql', $gmt );
+function bp_core_current_time( $gmt = true, $type = 'mysql' ) {
+    // Get current time
+    $current_time = current_time( $type, $gmt );
 
     return apply_filters( 'bp_core_current_time', $current_time );
@@ -841 +843 @@
      * work out time elapsed between two known dates.
      */
-    $newer_date = ( !$newer_date ) ? strtotime( bp_core_current_time() ) : $newer_date;
+    $newer_date = ( !$newer_date ) ? bp_core_current_time( true, 'timestamp' ) : $newer_date;
 
     // Difference in seconds

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

@@ -346 +346 @@
         $this->assertNotEmpty( buddypress()->loaded_components['foo'] );
     }
+
+    /**
+     * @group bp_core_time_since
+     * @group bp_core_current_time
+     */
+    public function test_bp_core_time_since_timezone_right_now() {
+        // backup timezone
+        $tz_backup = date_default_timezone_get();
+
+        // set timezone to something other than UTC
+        date_default_timezone_set( 'Europe/Paris' );
+
+        $this->assertSame( 'right now', bp_core_time_since( time() ) );
+
+        // revert timezone back to normal
+        if ( $tz_backup ) {
+            date_default_timezone_set( $tz_backup );
+        }
+    }
+
+    /**
+     * @group bp_core_time_since
+     * @group bp_core_current_time
+     */
+    public function test_bp_core_time_since_timezone() {
+        // backup timezone
+        $tz_backup = date_default_timezone_get();
+
+        // set timezone to something other than UTC
+        date_default_timezone_set( 'Europe/Paris' );
+
+        $this->assertSame( '1 hour ago', bp_core_time_since( time() - 60*60 ) );
+
+        // revert timezone back to normal
+        if ( $tz_backup ) {
+            date_default_timezone_set( $tz_backup );
+        }
+    }
 }