Changeset 2542

Timestamp:

02/02/2010 06:29:33 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1767

Location:

trunk

Files:

• bp-activity.php (modified) (3 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-activity.php

@@ -333 +333 @@
 
         $activity_id = $bp->action_variables[0];
+        $activity = new BP_Activity_Activity( $activity_id );
 
         /* Check access */
-        if ( !is_site_admin() ) {
-                $activity = new BP_Activity_Activity( $activity_id );
-
-                if ( $activity->user_id != $bp->loggedin_user->id )
-                        return false;
-        }
+        if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+                return false;
 
         /* Now delete the activity item */
-        if ( bp_activity_delete_by_activity_id( $activity_id ) )
+        if ( bp_activity_delete( array( 'id' => $activity_id, 'user_id' => $activity->user_id  ) ) )
                 bp_core_add_message( __( 'Activity deleted', 'buddypress' ) );
         else
@@ -350 +347 @@
         do_action( 'bp_activity_action_delete_activity', $activity_id );
 
-        bp_core_redirect( $_SERVER['HTTP_REFERER'] );
+        bp_core_redirect( wp_get_referer() );
 }
 add_action( 'wp', 'bp_activity_action_delete_activity', 3 );
@@ -697 +694 @@
                 return false;
 
+        /* Check if the user's latest update has been deleted */
+        if ( empty( $args['user_id'] ) )
+                $user_id = $bp->loggedin_user->id;
+        else
+                $user_id = $args['user_id'];
+
+        $latest_update = get_usermeta( $user_id, 'bp_latest_update' );
+        if ( !empty( $latest_update ) ) {
+                if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) )
+                        delete_usermeta( $user_id, 'bp_latest_update' );
+        }
+
         do_action( 'bp_activity_delete', $args );
         do_action( 'bp_activity_deleted_activities', $activity_ids_deleted );

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

@@ -156 +156 @@
         }
 
-        if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) || !bp_activity_delete( array( 'id' => $_POST['id'] ) ) ) {
+        $activity = new BP_Activity_Activity( $_POST['id'] );
+
+        /* Check access */
+        if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+                return false;
+
+        if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) || !bp_activity_delete( array( 'id' => $_POST['id'], 'user_id' => $activity->user_id ) ) ) {
                 echo '-1<div id="message" class="error"><p>' . __( 'There was a problem when deleting. Please try again.', 'buddypress' ) . '</p></div>';
                 return false;