Changeset 2822 for trunk/bp-activity.php

Timestamp:

03/08/2010 04:20:25 PM (16 years ago)

Author:

apeatling

Message:

Merge 1.2 branch with trunk

File:

• trunk/bp-activity.php (modified) (6 diffs)

trunk/bp-activity.php

@@ -248 +248 @@
         if ( !$has_access ) {
                 bp_core_add_message( __( 'You do not have access to this activity.', 'buddypress' ), 'error' );
-                bp_core_redirect( $bp->loggedin_user->domain );
+
+                if ( is_user_logged_in() )
+                        bp_core_redirect( $bp->loggedin_user->domain );
+                else
+                        bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . clean_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) );
         }
 
@@ -312 +316 @@
         if ( $activity->component == $bp->groups->id ) {
                 if ( $activity->user_id )
-                        $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
+                        $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id . '/';
                 else {
                         if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) )
-                                $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id;
+                                $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id . '/';
                 }
         } else
                 $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
 
+        $redirect = apply_filters( 'bp_activity_permalink_redirect_url', $redirect, &$activity );
+
         if ( !$redirect )
                 bp_core_redirect( $bp->root_domain );
 
         /* Redirect to the actual activity permalink page */
-        bp_core_redirect( apply_filters( 'bp_activity_action_permalink_url', $redirect . '/', &$activity ) );
+        bp_core_redirect( $redirect );
 }
 add_action( 'wp', 'bp_activity_action_permalink_router', 3 );
@@ -715 +721 @@
 
         $defaults = array(
+                'id' => false,
                 'content' => false,
                 'user_id' => $bp->loggedin_user->id,
@@ -736 +743 @@
         /* Insert the activity comment */
         $comment_id = bp_activity_add( array(
+                'id' => $id,
                 'action' => apply_filters( 'bp_activity_comment_action', sprintf( __( '%s posted a new activity comment:', 'buddypress' ), bp_core_get_userlink( $user_id ) ) ),
                 'content' => apply_filters( 'bp_activity_comment_content', $content ),
@@ -773 +781 @@
                 'secondary_item_id' => false,
                 'action' => false,
-                'content' => false
+                'content' => false,
+                'date_recorded' => false,
         );
 
@@ -779 +788 @@
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_activity_get_activity_id', BP_Activity_Activity::get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content ) );
+        return apply_filters( 'bp_activity_get_activity_id', BP_Activity_Activity::get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content, $date_recorded ) );
 }