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

Timestamp:

02/13/2012 05:46:52 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Clean up $bp->current_component, $bp->current_action, and $bp->current_item usage. Fixes #3738.

File:

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

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

@@ -277 +277 @@
 
     // The default scope should recognize custom slugs
-    if ( array_key_exists( $bp->current_action, (array) $bp->loaded_components ) ) {
-        $scope = $bp->loaded_components[$bp->current_action];
+    if ( array_key_exists( bp_current_action(), (array) $bp->loaded_components ) ) {
+        $scope = $bp->loaded_components[bp_current_action()];
     }
     else
@@ -1812 +1812 @@
      * @since 1.2.0
      *
-     * @global object $bp BuddyPress global settings
      * @uses apply_filters() To call the 'bp_get_activity_permalink_id' hook
      *
@@ -1818 +1817 @@
      */
     function bp_get_activity_permalink_id() {
-        global $bp;
-
-        return apply_filters( 'bp_get_activity_permalink_id', $bp->current_action );
+        return apply_filters( 'bp_get_activity_permalink_id', bp_current_action() );
     }