Changeset 9378

Timestamp:

01/19/2015 08:53:46 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Remove $bp global touches in bp-activity-classes.php. See #5138.

File:

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

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

@@ -136 +136 @@
      */
     public function populate() {
-        global $wpdb, $bp;
+        global $wpdb;
 
         $row = wp_cache_get( $this->id, 'bp_activity' );
 
         if ( false === $row ) {
+            $bp  = buddypress();
             $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
 
@@ -302 +303 @@
      */
     public static function get( $args = array() ) {
-        global $wpdb, $bp;
+        global $wpdb;
 
         // Backward compatibility with old method of passing arguments
@@ -326 +327 @@
         }
 
-        $r = wp_parse_args( $args, array(
+        $bp = buddypress();
+        $r  = wp_parse_args( $args, array(
             'page'              => 1,          // The current page
             'per_page'          => 25,         // Activity items per page
@@ -1055 +1057 @@
      */
     public static function delete( $args = array() ) {
-        global $wpdb, $bp;
+        global $wpdb;
+
+        $bp = buddypress();
 
         $defaults = array(
@@ -1156 +1160 @@
      */
     public static function delete_activity_item_comments( $activity_ids = array(), $delete_meta = true ) {
-        global $bp, $wpdb;
-
-        $delete_meta = (bool) $delete_meta;
-
+        global $wpdb;
+
+        $bp = buddypress();
+
+        $delete_meta  = (bool) $delete_meta;
         $activity_ids = implode( ',', wp_parse_id_list( $activity_ids ) );
 
@@ -1227 +1232 @@
      * @since BuddyPress (1.2)
      *
-     * @global BuddyPress $bp The one true BuddyPress instance.
      * @global wpdb $wpdb WordPress database object.
      *
@@ -1238 +1242 @@
      */
     public static function get_activity_comments( $activity_id, $left, $right, $spam = 'ham_only', $top_level_parent_id = 0 ) {
-        global $wpdb, $bp;
+        global $wpdb;
 
         if ( empty( $top_level_parent_id ) ) {
@@ -1253 +1257 @@
         // A true cache miss
         } elseif ( empty( $comments ) ) {
+
+            $bp = buddypress();
 
             // Select the user's fullname with the query
@@ -1420 +1426 @@
      * @since BuddyPress (1.2)
      *
-     * @global BuddyPress $bp The one true BuddyPress instance.
      * @global wpdb $wpdb WordPress database object.
      *
@@ -1427 +1432 @@
      */
     public static function get_child_comments( $parent_id ) {
-        global $bp, $wpdb;
+        global $wpdb;
+
+        $bp = buddypress();
 
         return $wpdb->get_results( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND secondary_item_id = %d", $parent_id ) );
@@ -1443 +1450 @@
      */
     public static function get_recorded_components( $skip_last_activity = true ) {
-        global $wpdb, $bp;
-
-        if ( $skip_last_activity ) {
+        global $wpdb;
+
+        $bp = buddypress();
+
+        if ( true === $skip_last_activity ) {
             $components = $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} WHERE action != '' AND action != 'last_activity' ORDER BY component ASC" );
         } else {
@@ -1597 +1606 @@
      */
     public static function get_last_updated() {
-        global $bp, $wpdb;
+        global $wpdb;
+
+        $bp = buddypress();
 
         return $wpdb->get_var( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" );
@@ -1629 +1640 @@
      */
     public static function check_exists_by_content( $content ) {
-        global $wpdb, $bp;
+        global $wpdb;
+
+        $bp = buddypress();
 
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->activity->table_name} WHERE content = %s", $content ) );
@@ -1641 +1654 @@
      */
     public static function hide_all_for_user( $user_id ) {
-        global $wpdb, $bp;
+        global $wpdb;
+
+        $bp = buddypress();
 
         return $wpdb->get_var( $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET hide_sitewide = 1 WHERE user_id = %d", $user_id ) );