Changeset 5684 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

02/09/2012 10:10:47 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Activity component. See #3989.

File:

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

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

@@ -374 +374 @@
      * Append activity comments to their associated activity items
      *
-     * @global object $bp Global BuddyPress settings object
      * @global wpdb $wpdb WordPress database object
      * @param array $activities
@@ -382 +381 @@
      */
     function append_comments( $activities, $spam = 'ham_only' ) {
-        global $bp, $wpdb;
+        global $wpdb;
 
         $activity_comments = array();
@@ -498 +497 @@
 
     function get_sitewide_items_for_feed( $limit = 35 ) {
-        global $wpdb, $bp;
-
-        $activities = bp_activity_get_sitewide( array( 'max' => $limit ) );
+        global $bp;
+
+        $activities    = bp_activity_get_sitewide( array( 'max' => $limit ) );
+        $activity_feed = array();
 
         for ( $i = 0, $count = count( $activities ); $i < $count; ++$i ) {
-                $title = explode( '<span', $activities[$i]['content'] );
-
-                $activity_feed[$i]['title'] = trim( strip_tags( $title[0] ) );
-                $activity_feed[$i]['link'] = $activities[$i]['primary_link'];
+                $title                            = explode( '<span', $activities[$i]['content'] );
+                $activity_feed[$i]['title']       = trim( strip_tags( $title[0] ) );
+                $activity_feed[$i]['link']        = $activities[$i]['primary_link'];
                 $activity_feed[$i]['description'] = @sprintf( $activities[$i]['content'], '' );
-                $activity_feed[$i]['pubdate'] = $activities[$i]['date_recorded'];
+                $activity_feed[$i]['pubdate']     = $activities[$i]['date_recorded'];
         }
 
@@ -539 +538 @@
 
     function get_filter_sql( $filter_array ) {
-        global $wpdb;
+
+        $filter_sql = array();
 
         if ( !empty( $filter_array['user_id'] ) ) {
@@ -571 +571 @@
         }
 
-        if ( empty($filter_sql) )
+        if ( empty( $filter_sql ) )
             return false;