Changeset 9471 for trunk/src/bp-activity/bp-activity-actions.php

Timestamp:

02/10/2015 02:49:16 AM (11 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-activity/bp-activity-actions.php (modified) (5 diffs)

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

@@ -36 +36 @@
  * @since BuddyPress (1.2)
  *
- * @global object $bp BuddyPress global settings
  * @uses bp_is_activity_component()
  * @uses bp_is_current_action()
@@ -201 +200 @@
  * @since BuddyPress (1.6)
  *
- * @global object $bp BuddyPress global settings
  * @param int $activity_id Activity id to be deleted. Defaults to 0.
  * @return bool False on failure.
  */
 function bp_activity_action_spam_activity( $activity_id = 0 ) {
-    global $bp;
+    $bp = buddypress();
 
     // Not viewing activity, or action is not spam, or Akismet isn't present
@@ -507 +505 @@
  * @since BuddyPress (1.0)
  *
- * @global object $bp BuddyPress global settings
  * @uses bp_is_activity_component()
  * @uses bp_is_current_action()
@@ -516 +513 @@
  */
 function bp_activity_action_sitewide_feed() {
-    global $bp;
+    $bp = buddypress();
 
     if ( ! bp_is_activity_component() || ! bp_is_current_action( 'feed' ) || bp_is_user() || ! empty( $bp->groups->current_group ) )
@@ -715 +712 @@
  *
  * @since BuddyPress (1.6)
- *
- * @global object $bp BuddyPress global settings
  */
 function bp_activity_setup_akismet() {
-    global $bp;
+    $bp = buddypress();
 
     // Bail if Akismet is not active