Changeset 9471 for trunk/src/bp-groups/bp-groups-filters.php

Timestamp:

02/10/2015 02:49:16 AM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace all remaining $bp global touches with buddypress().

All existing tests continue to pass as normal. I will further manually scrutinize each replacement to ensure correctness.

Fixes #5138. Any stragglers or updates will reference this ticket.

File:

• trunk/src/bp-groups/bp-groups-filters.php (modified) (4 diffs)

trunk/src/bp-groups/bp-groups-filters.php

@@ -142 +142 @@
  */
 function groups_add_forum_tables_sql( $sql = '' ) {
-    global $bp;
+    $bp = buddypress();
 
     $sql .= 'JOIN ' . $bp->groups->table_name . ' AS g LEFT JOIN ' . $bp->groups->table_name_groupmeta . ' AS gm ON g.id = gm.group_id ';
@@ -156 +156 @@
  */
 function groups_add_forum_where_sql( $sql = '' ) {
-    global $bp;
 
     // Define locale variable
@@ -190 +189 @@
     // Assemble Voltron
     $parts_string = implode( ' AND ', $parts );
+
+    $bp = buddypress();
 
     // Set it to the global filter
@@ -207 +208 @@
  */
 function groups_filter_bbpress_caps( $value, $cap, $args ) {
-    global $bp;
 
     if ( bp_current_user_can( 'bp_moderate' ) )
         return true;
 
-    if ( 'add_tag_to' == $cap )
-        if ( $bp->groups->current_group->user_has_access ) return true;
+    if ( 'add_tag_to' === $cap ) {
+        $bp = buddypress();
+
+        if ( $bp->groups->current_group->user_has_access ) {
+            return true;
+        }
+    }
 
     if ( 'manage_forums' == $cap && is_user_logged_in() )