Changeset 2416 for trunk/bp-core.php

Timestamp:

01/24/2010 01:13:15 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1641

File:

• trunk/bp-core.php (modified) (2 diffs)

trunk/bp-core.php

@@ -1357 +1357 @@
     );
 
-    $older_date = strtotime( gmdate( 'Y-m-d H:i:s', $older_date ) );
+    if ( !is_numeric( $older_date ) )
+        $older_date = strtotime( $older_date . ' GMT' );
 
     /* $newer_date will equal false if we want to know the time elapsed between a date and the current time */
     /* $newer_date will have a value if we want to work out time elapsed between two known dates */
-    $newer_date = ( !$newer_date ) ? ( strtotime( gmdate( 'Y-m-d H:i:s' ) ) + ( 60*60*0 ) ) : $newer_date;
+    $newer_date = ( !$newer_date ) ? gmmktime() : $newer_date;
 
     /* Difference in seconds */
@@ -1393 +1394 @@
         $seconds2 = $chunks[$i + 1][0];
         $name2 = $chunks[$i + 1][1];
-
-        //if ( $chunks[$i + 1][1] == __( 'second', 'buddypress' ) ) return $output;
 
         if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {