Changeset 2424

Timestamp:

01/24/2010 03:30:34 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1669

Location:

trunk

Files:

• bp-blogs.php (modified) (3 diffs)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-groups.php (modified) (8 diffs)
• bp-groups/bp-groups-classes.php (modified) (5 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/groups/create.php (modified) (1 diff)
• bp-themes/bp-sn-parent/_inc/ajax.php (modified) (2 diffs)

trunk/bp-blogs.php

@@ -353 +353 @@
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'name', $name );
         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'description', $description );
-        bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', time() );
+        bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
         /* Only record this activity if the blog is public */
@@ -401 +401 @@
                                 $recorded_post_id = $recorded_post->save();
 
-                                bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
+                                bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
                         }
 
@@ -494 +494 @@
                 $recorded_commment_id = $recorded_comment->save();
 
-                bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
+                bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
         }
 

trunk/bp-core.php

@@ -1427 +1427 @@
         $activity = get_usermeta( $bp->loggedin_user->id, 'last_activity' );
 
-        if ( '' == $activity || time() >= strtotime( '+5 minutes', $activity ) )
-                update_usermeta( $bp->loggedin_user->id, 'last_activity', time() );
+        if ( !is_numeric( $activity ) )
+                $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" ) );
 }
 add_action( 'wp_head', 'bp_core_record_activity' );

trunk/bp-core/bp-core-classes.php

@@ -137 +137 @@
 
                 if ( 'online' == $type )
-                        $sql['where_online'] = "AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW()";
+                        $sql['where_online'] = "AND DATE_ADD( um.meta_value, INTERVAL 5 MINUTE ) >= NOW()";
 
                 if ( 'alphabetical' == $type )

trunk/bp-groups.php

@@ -1095 +1095 @@
                         }
 
-                        if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => time() ) ) ) {
+                        if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title($_POST['group-name']) ), 'date_created' => gmdate( "Y-m-d H:i:s" ) ) ) ) {
                                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
                                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
@@ -1101 +1101 @@
 
                         groups_update_groupmeta( $bp->groups->new_group_id, 'total_member_count', 1 );
-                        groups_update_groupmeta( $bp->groups->new_group_id, 'last_activity', time() );
+                        groups_update_groupmeta( $bp->groups->new_group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
                 }
 
@@ -1336 +1336 @@
 
 function groups_update_last_activity( $group_id ) {
-        groups_update_groupmeta( $group_id, 'last_activity', time() );
+        groups_update_groupmeta( $group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 }
 add_action( 'groups_joined_group', 'groups_update_last_activity' );
@@ -1520 +1520 @@
                 $member->user_title = __( 'Group Admin', 'buddypress' );
                 $member->is_confirmed = 1;
+                $member->date_modified = gmdate( "Y-m-d H:i:s" );
 
                 $member->save();
@@ -1692 +1693 @@
         $new_member->is_admin = 0;
         $new_member->user_title = '';
-        $new_member->date_modified = time();
+        $new_member->date_modified = gmdate( "Y-m-d H:i:s" );
         $new_member->is_confirmed = 1;
 
@@ -1707 +1708 @@
         /* Modify group meta */
         groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
-        groups_update_groupmeta( $group_id, 'last_activity', time() );
+        groups_update_groupmeta( $group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
         do_action( 'groups_join_group', $group_id, $user_id );
@@ -2126 +2127 @@
                 'group_id' => false,
                 'inviter_id' => $bp->loggedin_user->id,
-                'date_modified' => time(),
+                'date_modified' => gmdate( "Y-m-d H:i:s" ),
                 'is_confirmed' => 0
         );
@@ -2305 +2306 @@
         $requesting_user->is_admin = 0;
         $requesting_user->user_title = '';
-        $requesting_user->date_modified = time();
+        $requesting_user->date_modified = gmdate( "Y-m-d H:i:s" );
         $requesting_user->is_confirmed = 0;
         $requesting_user->comments = $_POST['group-request-membership-comments'];

trunk/bp-groups/bp-groups-classes.php

@@ -42 +42 @@
                         $this->status = $group->status;
                         $this->enable_forum = $group->enable_forum;
-                        $this->date_created = strtotime($group->date_created);
+                        $this->date_created = $group->date_created;
                         $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
 
@@ -85 +85 @@
                                         status = %s,
                                         enable_forum = %d,
-                                        date_created = FROM_UNIXTIME(%d)
+                                        date_created = %s
                                 WHERE
                                         id = %d
@@ -109 +109 @@
                                         date_created
                                 ) VALUES (
-                                        %d, %s, %s, %s, %s, %d, FROM_UNIXTIME(%d)
+                                        %d, %s, %s, %s, %s, %d, %s
                                 )",
                                         $this->creator_id,
@@ -643 +643 @@
                         $this->is_banned = $member->is_banned;
                         $this->user_title = $member->user_title;
-                        $this->date_modified = strtotime($member->date_modified);
+                        $this->date_modified = $member->date_modified;
                         $this->is_confirmed = $member->is_confirmed;
                         $this->comments = $member->comments;
@@ -670 +670 @@
 
                 if ( $this->id ) {
-                        $sql = $wpdb->prepare( "UPDATE {$bp->groups->table_name_members} SET inviter_id = %d, is_admin = %d, is_mod = %d, is_banned = %d, user_title = %s, date_modified = FROM_UNIXTIME(%d), is_confirmed = %d, comments = %s, invite_sent = %d WHERE id = %d", $this->inviter_id, $this->is_admin, $this->is_mod, $this->is_banned, $this->user_title, $this->date_modified, $this->is_confirmed, $this->comments, $this->invite_sent, $this->id );
-                } else {
-                        $sql = $wpdb->prepare( "INSERT INTO {$bp->groups->table_name_members} ( user_id, group_id, inviter_id, is_admin, is_mod, is_banned, user_title, date_modified, is_confirmed, comments, invite_sent ) VALUES ( %d, %d, %d, %d, %d, %d, %s, FROM_UNIXTIME(%d), %d, %s, %d )", $this->user_id, $this->group_id, $this->inviter_id, $this->is_admin, $this->is_mod, $this->is_banned, $this->user_title, $this->date_modified, $this->is_confirmed, $this->comments, $this->invite_sent );
+                        $sql = $wpdb->prepare( "UPDATE {$bp->groups->table_name_members} SET inviter_id = %d, is_admin = %d, is_mod = %d, is_banned = %d, user_title = %s, date_modified = %s, is_confirmed = %d, comments = %s, invite_sent = %d WHERE id = %d", $this->inviter_id, $this->is_admin, $this->is_mod, $this->is_banned, $this->user_title, $this->date_modified, $this->is_confirmed, $this->comments, $this->invite_sent, $this->id );
+                } else {
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->groups->table_name_members} ( user_id, group_id, inviter_id, is_admin, is_mod, is_banned, user_title, date_modified, is_confirmed, comments, invite_sent ) VALUES ( %d, %d, %d, %d, %d, %d, %s, %s, %d, %s, %d )", $this->user_id, $this->group_id, $this->inviter_id, $this->is_admin, $this->is_mod, $this->is_banned, $this->user_title, $this->date_modified, $this->is_confirmed, $this->comments, $this->invite_sent );
                 }
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -133 +133 @@
 
                                 <div class="acomment-meta">
-                                        <?php echo bp_core_get_userlink( bp_get_activity_user_id() ) ?> &middot; <?php printf( __( '%s ago', 'buddypress' ), bp_core_time_since( time() ) ) ?> &middot;
+                                        <?php echo bp_core_get_userlink( bp_get_activity_user_id() ) ?> &middot; <?php printf( __( '%s ago', 'buddypress' ), bp_core_time_since( gmdate( "Y-m-d H:i:s" ) ) ) ?> &middot;
                                         <a class="acomment-reply" href="#acomment-<?php bp_activity_id() ?>" id="acomment-reply-<?php echo attribute_escape( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ) ?></a>
                                          &middot; <a href="<?php echo wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/' . bp_get_activity_id(), 'bp_activity_delete_link' ) ?>" class="delete acomment-delete confirm"><?php _e( 'Delete', 'buddypress' ) ?></a>

trunk/bp-themes/bp-default/groups/create.php

@@ -55 +55 @@
                                                         <?php if ( is_site_admin() ) : ?>
                                                                 <div class="checkbox">
-                                                                        <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __('<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), $bp->root_domain . '/wp-admin/admin.php?page=buddypress/bp-forums.php' ) ?></label>
+                                                                        <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __('<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bb-forums-setup' ) ?></label>
                                                                 </div>
                                                         <?php endif; ?>

trunk/bp-themes/bp-sn-parent/_inc/ajax.php

@@ -268 +268 @@
 
                                 <h3><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a></h3>
-                                <small><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( time() ) ) ?></small>
+                                <small><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( gmdate( "Y-m-d H:i:s" ) ) ) ?></small>
                         </div>
 
@@ -531 +531 @@
 
                 <div class="acomment-meta">
-                        <?php echo bp_core_get_userlink( $bp->loggedin_user->id ) ?> &middot; <?php echo bp_core_time_since( time() ) ?> &middot;
+                        <?php echo bp_core_get_userlink( $bp->loggedin_user->id ) ?> &middot; <?php echo bp_core_time_since( gmdate( "Y-m-d H:i:s" ) ) ?> &middot;
                         <a class="acomment-reply" href="#acomment-<?php echo $comment_id ?>" id="acomment-reply-<?php echo attribute_escape( $_POST['form_id'] ) ?>"><?php _e( 'Reply', 'buddypress' ) ?></a>
                         <?php if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id ) : ?>