Changeset 9471 for trunk/src/bp-activity/bp-activity-template.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-template.php (modified) (3 diffs)

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

@@ -165 +165 @@
      */
     function __construct( $args ) {
-        global $bp;
+        $bp = buddypress();
 
         // Backward compatibility with old method of passing arguments
@@ -427 +427 @@
  *
  * @global object $activities_template {@link BP_Activity_Template}
- * @global object $bp BuddyPress global settings.
  * @uses groups_is_user_member()
  * @uses bp_current_action()
@@ -1349 +1348 @@
      * @see bp_core_fetch_avatar() For a description of the arguments.
      * @global object $activities_template {@link BP_Activity_Template}
-     * @global object $bp BuddyPress global settings
      * @uses bp_is_single_activity()
      * @uses wp_parse_args()