Changeset 3142 for branches/1.2/bp-core.php

Timestamp:

07/21/2010 07:33:39 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2203 and #2497. Introduces bp_core_current_time function as central handler for all time related functions. Removes unused bp_core_format_time in lieu of currently used bp_format_time.

File:

• branches/1.2/bp-core.php (modified) (4 diffs)

branches/1.2/bp-core.php

@@ -1290 +1290 @@
 
 /**
- * bp_core_format_time()
- */
-function bp_core_format_time( $time, $just_date = false ) {
-        if ( !$time )
-                return false;
-
-        $date = date( "F j, Y ", $time );
-
-        if ( !$just_date ) {
-                $date .= __('at', 'buddypress') . date( ' g:iA', $time );
-        }
-
-        return $date;
+ * bp_core_current_time()
+ *
+ * Get the current GMT time to save into the DB
+ *
+ * @package BuddyPress Core
+ * @since 1.2.6
+ */
+function bp_core_current_time() {
+        // Get current time in MYSQL format
+        $current_time = current_time( 'mysql', true );
+
+        return apply_filters( 'bp_core_current_time', $current_time );
 }
 
@@ -1400 +1399 @@
  */
 function bp_core_time_since( $older_date, $newer_date = false ) {
+
         // array of time period chunks
-
         $chunks = array(
-        array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
-        array( 60 * 60 * 24 * 30 , __( 'month', 'buddypress' ), __( 'months', 'buddypress' ) ),
-        array( 60 * 60 * 24 * 7, __( 'week', 'buddypress' ), __( 'weeks', 'buddypress' ) ),
-        array( 60 * 60 * 24 , __( 'day', 'buddypress' ), __( 'days', 'buddypress' ) ),
-        array( 60 * 60 , __( 'hour', 'buddypress' ), __( 'hours', 'buddypress' ) ),
-        array( 60 , __( 'minute', 'buddypress' ), __( 'minutes', 'buddypress' ) ),
-        array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
+                array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
+                array( 60 * 60 * 24 * 30 , __( 'month', 'buddypress' ), __( 'months', 'buddypress' ) ),
+                array( 60 * 60 * 24 * 7, __( 'week', 'buddypress' ), __( 'weeks', 'buddypress' ) ),
+                array( 60 * 60 * 24 , __( 'day', 'buddypress' ), __( 'days', 'buddypress' ) ),
+                array( 60 * 60 , __( 'hour', 'buddypress' ), __( 'hours', 'buddypress' ) ),
+                array( 60 , __( 'minute', 'buddypress' ), __( 'minutes', 'buddypress' ) ),
+                array( 1, __( 'second', 'buddypress' ), __( 'seconds', 'buddypress' ) )
         );
 
@@ -1421 +1420 @@
         /* $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 ) ? gmmktime( gmdate( 'H' ), gmdate( 'i' ), gmdate( 's' ), gmdate( 'n' ), gmdate( 'j' ), gmdate( 'Y' ) ) : $newer_date;
+        $newer_date = ( !$newer_date ) ? strtotime( bp_core_current_time() ) : $newer_date;
 
         /* Difference in seconds */
@@ -1489 +1488 @@
                 $activity = strtotime( $activity );
 
-        if ( '' == $activity || strtotime( gmdate( "Y-m-d H:i:s" ) ) >= strtotime( '+5 minutes', $activity ) )
-                update_usermeta( $bp->loggedin_user->id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+        // Get current time
+        $current_time = bp_core_current_time();
+
+        if ( '' == $activity || strtotime( $current_time ) >= strtotime( '+5 minutes', $activity ) )
+                update_usermeta( $bp->loggedin_user->id, 'last_activity', $current_time );
 }
 add_action( 'wp_head', 'bp_core_record_activity' );