<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2424] trunk: Fixes #1669</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2424</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-24 15:30:34 +0000 (Sun, 24 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1669</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupscreatephp">trunk/bp-themes/bp-default/groups/create.php</a></li>
<li><a href="#trunkbpthemesbpsnparent_incajaxphp">trunk/bp-themes/bp-sn-parent/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-blogs.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx">
</span><span class="cx">         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'name', $name );
</span><span class="cx">         bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'description', $description );
</span><del>-        bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', time() );
</del><ins>+        bp_blogs_update_blogmeta( $recorded_blog->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</ins><span class="cx">
</span><span class="cx">         /* Only record this activity if the blog is public */
</span><span class="cx">         if ( (int)$_POST['blog_public'] && !$no_activity ) {
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx">
</span><span class="cx">                                 $recorded_post_id = $recorded_post->save();
</span><span class="cx">
</span><del>-                                bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
</del><ins>+                                bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</ins><span class="cx">                         }
</span><span class="cx">
</span><span class="cx">                         if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">
</span><span class="cx">                 $recorded_commment_id = $recorded_comment->save();
</span><span class="cx">
</span><del>-                bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
</del><ins>+                bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</span></span></pre></div>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-core/bp-core-classes.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">                         $sql['where_popular'] = "AND um.meta_key = 'total_friend_count'";
</span><span class="cx">
</span><span class="cx">                 if ( 'online' == $type )
</span><del>-                        $sql['where_online'] = "AND DATE_ADD( FROM_UNIXTIME(um.meta_value), INTERVAL 5 MINUTE ) >= NOW()";
</del><ins>+                        $sql['where_online'] = "AND DATE_ADD( um.meta_value, INTERVAL 5 MINUTE ) >= NOW()";
</ins><span class="cx">
</span><span class="cx">                 if ( 'alphabetical' == $type )
</span><span class="cx">                         $sql['where_alpha'] = "AND pd.field_id = 1";
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-core.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -1426,8 +1426,11 @@
</span><span class="cx">
</span><span class="cx">         $activity = get_usermeta( $bp->loggedin_user->id, 'last_activity' );
</span><span class="cx">
</span><del>-        if ( '' == $activity || time() >= strtotime( '+5 minutes', $activity ) )
-                update_usermeta( $bp->loggedin_user->id, 'last_activity', time() );
</del><ins>+        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" ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_head', 'bp_core_record_activity' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-groups/bp-groups-classes.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">                         $this->description = stripslashes($group->description);
</span><span class="cx">                         $this->status = $group->status;
</span><span class="cx">                         $this->enable_forum = $group->enable_forum;
</span><del>-                        $this->date_created = strtotime($group->date_created);
</del><ins>+                        $this->date_created = $group->date_created;
</ins><span class="cx">                         $this->total_member_count = groups_get_groupmeta( $this->id, 'total_member_count' );
</span><span class="cx">
</span><span class="cx">                         if ( $get_user_dataset ) {
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">                                         description = %s,
</span><span class="cx">                                         status = %s,
</span><span class="cx">                                         enable_forum = %d,
</span><del>-                                        date_created = FROM_UNIXTIME(%d)
</del><ins>+                                        date_created = %s
</ins><span class="cx">                                 WHERE
</span><span class="cx">                                         id = %d
</span><span class="cx">                                 ",
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">                                         enable_forum,
</span><span class="cx">                                         date_created
</span><span class="cx">                                 ) VALUES (
</span><del>-                                        %d, %s, %s, %s, %s, %d, FROM_UNIXTIME(%d)
</del><ins>+                                        %d, %s, %s, %s, %s, %d, %s
</ins><span class="cx">                                 )",
</span><span class="cx">                                         $this->creator_id,
</span><span class="cx">                                         $this->name,
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx">                         $this->is_mod = $member->is_mod;
</span><span class="cx">                         $this->is_banned = $member->is_banned;
</span><span class="cx">                         $this->user_title = $member->user_title;
</span><del>-                        $this->date_modified = strtotime($member->date_modified);
</del><ins>+                        $this->date_modified = $member->date_modified;
</ins><span class="cx">                         $this->is_confirmed = $member->is_confirmed;
</span><span class="cx">                         $this->comments = $member->comments;
</span><span class="cx">                         $this->invite_sent = $member->invite_sent;
</span><span class="lines">@@ -669,9 +669,9 @@
</span><span class="cx">                 do_action( 'groups_member_before_save', $this );
</span><span class="cx">
</span><span class="cx">                 if ( $this->id ) {
</span><del>-                        $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 );
</del><ins>+                        $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 );
</ins><span class="cx">                 } else {
</span><del>-                        $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 );
</del><ins>+                        $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 );
</ins><span class="cx">                 }
</span><span class="cx">
</span><span class="cx">                 if ( !$wpdb->query($sql) )
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-groups.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -1094,13 +1094,13 @@
</span><span class="cx">                                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
</span><span class="cx">                         }
</span><span class="cx">
</span><del>-                        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() ) ) ) {
</del><ins>+                        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" ) ) ) ) {
</ins><span class="cx">                                 bp_core_add_message( __( 'There was an error saving group details, please try again.', 'buddypress' ), 'error' );
</span><span class="cx">                                 bp_core_redirect( $bp->root_domain . '/' . $bp->groups->slug . '/create/step/' . $bp->groups->current_create_step . '/' );
</span><span class="cx">                         }
</span><span class="cx">
</span><span class="cx">                         groups_update_groupmeta( $bp->groups->new_group_id, 'total_member_count', 1 );
</span><del>-                        groups_update_groupmeta( $bp->groups->new_group_id, 'last_activity', time() );
</del><ins>+                        groups_update_groupmeta( $bp->groups->new_group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</ins><span class="cx">                 }
</span><span class="cx">
</span><span class="cx">                 if ( 'group-settings' == $bp->groups->current_create_step ) {
</span><span class="lines">@@ -1335,7 +1335,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function groups_update_last_activity( $group_id ) {
</span><del>-        groups_update_groupmeta( $group_id, 'last_activity', time() );
</del><ins>+        groups_update_groupmeta( $group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'groups_joined_group', 'groups_update_last_activity' );
</span><span class="cx"> add_action( 'groups_leave_group', 'groups_update_last_activity' );
</span><span class="lines">@@ -1519,6 +1519,7 @@
</span><span class="cx">                 $member->is_admin = 1;
</span><span class="cx">                 $member->user_title = __( 'Group Admin', 'buddypress' );
</span><span class="cx">                 $member->is_confirmed = 1;
</span><ins>+                $member->date_modified = gmdate( "Y-m-d H:i:s" );
</ins><span class="cx">
</span><span class="cx">                 $member->save();
</span><span class="cx">         }
</span><span class="lines">@@ -1691,7 +1692,7 @@
</span><span class="cx">         $new_member->inviter_id = 0;
</span><span class="cx">         $new_member->is_admin = 0;
</span><span class="cx">         $new_member->user_title = '';
</span><del>-        $new_member->date_modified = time();
</del><ins>+        $new_member->date_modified = gmdate( "Y-m-d H:i:s" );
</ins><span class="cx">         $new_member->is_confirmed = 1;
</span><span class="cx">
</span><span class="cx">         if ( !$new_member->save() )
</span><span class="lines">@@ -1706,7 +1707,7 @@
</span><span class="cx">
</span><span class="cx">         /* Modify group meta */
</span><span class="cx">         groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
</span><del>-        groups_update_groupmeta( $group_id, 'last_activity', time() );
</del><ins>+        groups_update_groupmeta( $group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</ins><span class="cx">
</span><span class="cx">         do_action( 'groups_join_group', $group_id, $user_id );
</span><span class="cx">
</span><span class="lines">@@ -2125,7 +2126,7 @@
</span><span class="cx">                 'user_id' => false,
</span><span class="cx">                 'group_id' => false,
</span><span class="cx">                 'inviter_id' => $bp->loggedin_user->id,
</span><del>-                'date_modified' => time(),
</del><ins>+                'date_modified' => gmdate( "Y-m-d H:i:s" ),
</ins><span class="cx">                 'is_confirmed' => 0
</span><span class="cx">         );
</span><span class="cx">
</span><span class="lines">@@ -2304,7 +2305,7 @@
</span><span class="cx">         $requesting_user->inviter_id = 0;
</span><span class="cx">         $requesting_user->is_admin = 0;
</span><span class="cx">         $requesting_user->user_title = '';
</span><del>-        $requesting_user->date_modified = time();
</del><ins>+        $requesting_user->date_modified = gmdate( "Y-m-d H:i:s" );
</ins><span class="cx">         $requesting_user->is_confirmed = 0;
</span><span class="cx">         $requesting_user->comments = $_POST['group-request-membership-comments'];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-themes/bp-default/_inc/ajax.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">                                 </div>
</span><span class="cx">
</span><span class="cx">                                 <div class="acomment-meta">
</span><del>-                                        <?php echo bp_core_get_userlink( bp_get_activity_user_id() ) ?> &middot; <?php printf( __( '%s ago', 'buddypress' ), bp_core_time_since( time() ) ) ?> &middot;
</del><ins>+                                        <?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;
</ins><span class="cx">                                         <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>
</span><span class="cx">                                          &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>
</span><span class="cx">                                 </div>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupscreatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/create.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/create.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-themes/bp-default/groups/create.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">                                                 <?php else : ?>
</span><span class="cx">                                                         <?php if ( is_site_admin() ) : ?>
</span><span class="cx">                                                                 <div class="checkbox">
</span><del>-                                                                        <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>
</del><ins>+                                                                        <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>
</ins><span class="cx">                                                                 </div>
</span><span class="cx">                                                         <?php endif; ?>
</span><span class="cx">                                                 <?php endif; ?>
</span></span></pre></div>
<a id="trunkbpthemesbpsnparent_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/ajax.php (2423 => 2424)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/ajax.php        2010-01-24 14:38:08 UTC (rev 2423)
+++ trunk/bp-themes/bp-sn-parent/_inc/ajax.php        2010-01-24 15:30:34 UTC (rev 2424)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx">                                 <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?>
</span><span class="cx">
</span><span class="cx">                                 <h3><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a></h3>
</span><del>-                                <small><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( time() ) ) ?></small>
</del><ins>+                                <small><?php printf( __( 'Sent %s ago', 'buddypress' ), bp_core_time_since( gmdate( "Y-m-d H:i:s" ) ) ) ?></small>
</ins><span class="cx">                         </div>
</span><span class="cx">
</span><span class="cx">                         <div class="message-content">
</span><span class="lines">@@ -530,7 +530,7 @@
</span><span class="cx">                 </div>
</span><span class="cx">
</span><span class="cx">                 <div class="acomment-meta">
</span><del>-                        <?php echo bp_core_get_userlink( $bp->loggedin_user->id ) ?> &middot; <?php echo bp_core_time_since( time() ) ?> &middot;
</del><ins>+                        <?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;
</ins><span class="cx">                         <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>
</span><span class="cx">                         <?php if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id ) : ?>
</span><span class="cx">                                  &middot; <a href="<?php echo wp_nonce_url( $bp->activity->id . '/delete/?cid=' . $comment_id, 'delete_activity_comment' ) ?>" class="delete acomment-delete"><?php _e( 'Delete', 'buddypress' ) ?></a>
</span></span></pre>
</div>
</div>
</body>
</html>