Changeset 3580

Timestamp:

12/24/2010 07:25:05 PM (16 years ago)

Author:

djpaul

Message:

Consolidate BP_Activity_Activity::get_specific/::get methods. Fixes #2970, reverts a part of r 3566 and fixes a PHP notice.

Location:

trunk

Files:

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

trunk/bp-activity.php

@@ -261 +261 @@
         /* Redirect based on the type of activity */
         if ( $activity->component == $bp->groups->id ) {
-                if ( $activity->user_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 . '/';
-                else {
+                } else {
                         if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) )
                                 $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id . '/';
@@ -652 +652 @@
         extract( $r, EXTR_SKIP );
 
-        return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get_specific( $activity_ids, $max, $page, $per_page, $sort, $display_comments ) );
+        return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get( $max, $page, $per_page, $sort, false, false, $display_comments, false, false, $activity_ids ) );
 }
 

trunk/bp-activity/bp-activity-classes.php

@@ -121 +121 @@
                 if ( $exclude )
                         $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
-                
+
                 // The specific ids to which you want to limit the query
                 if ( !empty( $in ) ) {
@@ -181 +181 @@
         }
 
+        /**
+         * In BuddyPress 1.2.x, this was used to retrieve specific activity stream items (for example, on an activity's permalink page).
+         * As of 1.3.x, use BP_Activity_Activity::get( ..., $in ) instead.
+         *
+         * @deprecated 1.3
+         * @deprecated Use BP_Activity_Activity::get( ..., $in ) instead.
+         * @param mixed $activity_ids Array or comma-separated string of activity IDs to retrieve
+         * @param int $max Maximum number of results to return. (Optional; default is no maximum)
+         * @param int $page The set of results that the user is viewing. Used in pagination. (Optional; default is 1)
+         * @param int $per_page Specifies how many results per page. Used in pagination. (Optional; default is 25)
+         * @param string MySQL column sort; ASC or DESC. (Optional; default is DESC)
+         * @param bool $display_comments Retrieve an activity item's associated comments or not. (Optional; default is false)
+         * @return array
+         * @since 1.2
+         */
         function get_specific( $activity_ids, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $display_comments = false ) {
-                global $wpdb, $bp;
-
-                if ( is_array( $activity_ids ) )
-                        $activity_ids = implode( ',', $activity_ids );
-
-                $activity_ids = $wpdb->escape( $activity_ids );
-
-                if ( empty( $activity_ids ) )
-                        return false;
-
-                $pag_sql = '';
-                if ( $per_page && $page )
-                        $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
-
-                if ( $sort != 'ASC' && $sort != 'DESC' )
-                        $sort = 'DESC';
-
-                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql" ) );
-                $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids})" ) );
-
-                if ( $display_comments )
-                        $activities = BP_Activity_Activity::append_comments( $activities );
-
-                // If $max is set, only return up to the max results
-                if ( !empty( $max ) ) {
-                        if ( (int)$total_activities > (int)$max )
-                                $total_activities = $max;
-                }
-
-                return array( 'activities' => $activities, 'total' => (int)$total_activities );
+                _deprecated_function( __FUNCTION__, '1.3', 'Use BP_Activity_Activity::get( ..., $in ) instead.' );
+                return BP_Activity_Activity::get( $max, $page, $per_page, $sort, false, false, $display_comments, false, false, $activity_ids );
         }
 

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

@@ -424 +424 @@
                         $link = $activities_template->activity->primary_link;
                 else
-                        $link = bp_core_get_user_domain( $activities_template->activity->user_id );
+                        $link = bp_core_get_user_domain( $activities_template->activity->user_id, $activities_template->activity->user_nicename, $activities_template->activity->user_login );
 
                 return apply_filters( 'bp_get_activity_user_link', $link );

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

@@ -190 +190 @@
 
         $comment_id = bp_activity_new_comment( array(
+                'activity_id' => $_POST['form_id'],
                 'content' => $_POST['content'],
-                'activity_id' => $_POST['form_id'],
                 'parent_id' => $_POST['comment_id']
         ));
@@ -200 +200 @@
         }
 
-        if ( bp_has_activities ( 'include=' . $comment_id ) ) : ?>
+        if ( bp_has_activities ( 'display_comments=stream&include=' . $comment_id ) ) : ?>
                 <?php while ( bp_activities() ) : bp_the_activity(); ?>
                         <li id="acomment-<?php bp_activity_id() ?>">