Changeset 2666

Timestamp:

02/11/2010 12:50:00 PM (17 years ago)

Author:

apeatling

Message:

Make sure activity comments are separating their action an content and also being hidden publicly if on a private activity.

Location:

trunk

Files:

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

trunk/bp-activity.php

@@ -627 +627 @@
                 $parent_id = $activity_id;
 
-        /* Insert the "user posted a new activity comment header text" */
-        $comment_header = '<div class="comment-header">' . sprintf( __( '%s posted a new activity comment:', 'buddypress' ), bp_core_get_userlink( $user_id ) ) . ' <span class="time-since">%s</span></div> ';
+        /* Check to see if the parent activity is hidden, and if so, hide this comment publically. */
+        $activity = new BP_Activity_Activity( $activity_id );
+        $is_hidden = ( (int)$activity->hide_sitewide ) ? 1 : 0;
 
         /* Insert the activity comment */
         $comment_id = bp_activity_add( array(
-                'content' => apply_filters( 'bp_activity_comment_content', $comment_header . '<div class="activity-inner">' . $content . '</div>' ),
-                'primary_link' => '',
+                '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', '<div class="activity-inner">' . $content . '</div>' ),
                 'component' => $bp->activity->id,
                 'type' => 'activity_comment',
                 'user_id' => $user_id,
                 'item_id' => $activity_id,
-                'secondary_item_id' => $parent_id
+                'secondary_item_id' => $parent_id,
+                'hide_sitewide' => $is_hidden
         ) );
 

trunk/bp-activity/bp-activity-templatetags.php

@@ -191 +191 @@
                         $display_comments = 'stream';
 
+                $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
+
                 if ( $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id ) {
                         switch ( $scope ) {
@@ -209 +211 @@
                                                 $object = $bp->groups->id;
                                                 $primary_id = implode( ',', (array)$groups['groups'] );
-                                                $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
+
                                                 $user_id = false;
                                         }
@@ -219 +221 @@
 
                                         $include = implode( ',', (array)$favs );
-                                        $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
                                         break;
                                 case 'mentions':
@@ -225 +226 @@
                                         $user_login = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
                                         $search_terms = '@' . bp_core_get_username( $user_id, $user_nicename, $user_login );
-                                        $show_hidden = ( $user_id == $bp->loggedin_user->id ) ? 1 : 0;
                                         $display_comments = 'stream';
                                         $user_id = false;
@@ -570 +570 @@
                                 if ( !$comment->user_fullname )
                                         $comment->user_fullname = $comment->display_name;
+
+                                var_dump($comment->content);
 
                                 $content .= '<li id="acomment-' . $comment->id . '">';

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

@@ -194 +194 @@
 
                                 <div class="acomment-content">
-                                        <?php bp_activity_content() ?>
+                                        <?php bp_activity_content_body() ?>
                                 </div>
                         </li>