Changeset 3373

Timestamp:

11/07/2010 11:33:21 AM (15 years ago)

Author:

boonebgorges

Message:

Adds exclude parameter to bp_has_activities. Fixes #2646

Location:

trunk

Files:

• bp-activity.php (modified) (3 diffs)
• bp-activity/bp-activity-classes.php (modified) (6 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (5 diffs)

trunk/bp-activity.php

@@ -504 +504 @@
         'search_terms' => false, // Pass search terms as a string
         'show_hidden' => false, // Show activity items that are hidden site-wide?
+        'exclude' => false, // Comma-separated list of activity IDs to exclude
 
         /**
@@ -522 +523 @@
 
     /* Attempt to return a cached copy of the first page of sitewide activity. */
-    if ( 1 == (int)$page && empty( $max ) && empty( $search_terms ) && empty( $filter ) && 'DESC' == $sort ) {
+    if ( 1 == (int)$page && empty( $max ) && empty( $search_terms ) && empty( $filter ) && 'DESC' == $sort && empty( $exclude ) ) {
         if ( !$activity = wp_cache_get( 'bp_activity_sitewide_front', 'bp' ) ) {
             $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden );
@@ -528 +529 @@
         }
     } else
-        $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden );
+        $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude );
 
     return apply_filters( 'bp_activity_get', $activity, &$r );

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

@@ -71 +71 @@
             $this->primary_link = $bp->loggedin_user->domain;
 
-        /* If we have an existing ID, update the activity item, otherwise insert it. */
+        // If we have an existing ID, update the activity item, otherwise insert it.
         if ( $this->id )
             $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = %s, item_id = %s, secondary_item_id = %s, hide_sitewide = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->id );
@@ -87 +87 @@
     }
 
-    /* Static Functions */
-
-    function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false ) {
-        global $wpdb, $bp;
-
-        /* Select conditions */
+    // Static Functions
+
+    function get( $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $search_terms = false, $filter = false, $display_comments = false, $show_hidden = false, $exclude = false ) {
+        global $wpdb, $bp;
+
+        // Select conditions
         $select_sql = "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
 
         $from_sql = " FROM {$bp->activity->table_name} a LEFT JOIN {$wpdb->users} u ON a.user_id = u.ID";
 
-        /* Where conditions */
+        // Where conditions
         $where_conditions = array();
 
-        /* Searching */
+        // Searching
         if ( $search_terms ) {
             $search_terms = $wpdb->escape( $search_terms );
@@ -106 +106 @@
         }
 
-        /* Filtering */
+        // Filtering
         if ( $filter && $filter_sql = BP_Activity_Activity::get_filter_sql( $filter ) )
             $where_conditions['filter_sql'] = $filter_sql;
 
-        /* Sorting */
+        // Sorting
         if ( $sort != 'ASC' && $sort != 'DESC' )
             $sort = 'DESC';
 
-        /* Hide Hidden Items? */
+        // Hide Hidden Items?
         if ( !$show_hidden )
             $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
 
-        /* Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity */
+        // Exclude specified items
+        if ( $exclude )
+            $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
+
+        // Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity
         if ( !$display_comments || 'threaded' == $display_comments ) {
             $where_conditions[] = "a.type != 'activity_comment'";
@@ -134 +138 @@
         $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) FROM {$bp->activity->table_name} a {$where_sql} ORDER BY a.date_recorded {$sort}" ) );
 
-        /* Get the fullnames of users so we don't have to query in the loop */
+        // Get the fullnames of users so we don't have to query in the loop
         if ( bp_is_active( 'xprofile' ) && $activities ) {
             foreach ( (array)$activities as $activity ) {
@@ -161 +165 @@
             $activities = BP_Activity_Activity::append_comments( &$activities );
 
-        /* If $max is set, only return up to the max results */
+        // If $max is set, only return up to the max results
         if ( !empty( $max ) ) {
             if ( (int)$total_activities > (int)$max )
@@ -194 +198 @@
             $activities = BP_Activity_Activity::append_comments( $activities );
 
-        /* If $max is set, only return up to the max results */
+        // If $max is set, only return up to the max results
         if ( !empty( $max ) ) {
             if ( (int)$total_activities > (int)$max )

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

@@ -16 +16 @@
     var $full_name;
 
-    function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden ) {
+    function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude ) {
         global $bp;
 
@@ -33 +33 @@
         // Fetch all activity items
         else
-            $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden ) );
+            $this->activities = bp_activity_get( array( 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden, 'exclude' => $exclude ) );
 
         if ( !$max || $max >= (int)$this->activities['total'] )
@@ -143 +143 @@
     $user_id = false;
     $include = false;
+    $exclude = false;
     $show_hidden = false;
     $object = false;
@@ -167 +168 @@
     $defaults = array(
         'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
-        'include' => $include, // pass an activity_id or string of ID's comma separated
+        'include' => $include, // pass an activity_id or string of IDs comma-separated
+        'exclude' => $exclude, // pass an activity_id or string of IDs comma-separated
         'sort' => 'DESC', // sort DESC or ASC
         'page' => 1, // which page to load
@@ -255 +257 @@
         $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
 
-    $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
+    $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude );
 
     return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );