Changeset 7751 for trunk/bp-activity/bp-activity-template.php

Timestamp:

01/21/2014 10:39:09 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Replace $bp global references in slug functions with buddypress() calls. See #5138. (trunk)

File:

• trunk/bp-activity/bp-activity-template.php (modified) (4 diffs)

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

@@ -26 +26 @@
      * @since BuddyPress (1.5)
      *
-     * @global object $bp BuddyPress global settings.
      * @uses apply_filters() To call the 'bp_get_activity_slug' hook.
      *
@@ -32 +31 @@
      */
     function bp_get_activity_slug() {
-        global $bp;
-        return apply_filters( 'bp_get_activity_slug', $bp->activity->slug );
+        return apply_filters( 'bp_get_activity_slug', buddypress()->activity->slug );
     }
 
@@ -51 +49 @@
      * @since BuddyPress (1.5)
      *
-     * @global object $bp BuddyPress global settings.
      * @uses apply_filters() To call the 'bp_get_activity_root_slug' hook.
      *
@@ -57 +54 @@
      */
     function bp_get_activity_root_slug() {
-        global $bp;
-        return apply_filters( 'bp_get_activity_root_slug', $bp->activity->root_slug );
+        return apply_filters( 'bp_get_activity_root_slug', buddypress()->activity->root_slug );
     }