Changeset 7749

Timestamp:

01/21/2014 10:30:13 PM (13 years ago)

Author:

johnjamesjacoby

Message:

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

Location:

branches/1.9

Files:

• bp-activity/bp-activity-template.php (modified) (4 diffs)
• bp-friends/bp-friends-template.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (2 diffs)
• bp-members/bp-members-template.php (modified) (4 diffs)

branches/1.9/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 );
         }
 

branches/1.9/bp-friends/bp-friends-template.php

@@ -27 +27 @@
          */
         function bp_get_friends_slug() {
-                global $bp;
-                return apply_filters( 'bp_get_friends_slug', $bp->friends->slug );
+                return apply_filters( 'bp_get_friends_slug', buddypress()->friends->slug );
         }
 
@@ -47 +46 @@
          */
         function bp_get_friends_root_slug() {
-                global $bp;
-                return apply_filters( 'bp_get_friends_root_slug', $bp->friends->root_slug );
+                return apply_filters( 'bp_get_friends_root_slug', buddypress()->friends->root_slug );
         }
 

branches/1.9/bp-groups/bp-groups-template.php

@@ -31 +31 @@
          */
         function bp_get_groups_slug() {
-                global $bp;
-                return apply_filters( 'bp_get_groups_slug', $bp->groups->slug );
+                return apply_filters( 'bp_get_groups_slug', buddypress()->groups->slug );
         }
 
@@ -55 +54 @@
          */
         function bp_get_groups_root_slug() {
-                global $bp;
-                return apply_filters( 'bp_get_groups_root_slug', $bp->groups->root_slug );
+                return apply_filters( 'bp_get_groups_root_slug', buddypress()->groups->root_slug );
         }
 

branches/1.9/bp-members/bp-members-template.php

@@ -33 +33 @@
          */
         function bp_get_members_slug() {
-                global $bp;
-                return apply_filters( 'bp_get_members_slug', $bp->members->slug );
+                return apply_filters( 'bp_get_members_slug', buddypress()->members->slug );
         }
 
@@ -57 +56 @@
          */
         function bp_get_members_root_slug() {
-                global $bp;
-                return apply_filters( 'bp_get_members_root_slug', $bp->members->root_slug );
+                return apply_filters( 'bp_get_members_root_slug', buddypress()->members->root_slug );
         }
 
@@ -110 +108 @@
                 $bp = buddypress();
 
-                if ( !empty( $bp->pages->register->slug ) )
+                if ( !empty( $bp->pages->register->slug ) ) {
                         $slug = $bp->pages->register->slug;
-                elseif ( defined( 'BP_REGISTER_SLUG' ) )
+                } elseif ( defined( 'BP_REGISTER_SLUG' ) ) {
                         $slug = BP_REGISTER_SLUG;
-                else
+                } else {
                         $slug = 'register';
+                }
 
                 return apply_filters( 'bp_get_signup_slug', $slug );
@@ -140 +139 @@
          */
         function bp_get_activate_slug() {
-                global $bp;
-
-                if ( !empty( $bp->pages->activate->slug ) )
+                $bp = buddypress();
+
+                if ( !empty( $bp->pages->activate->slug ) ) {
                         $slug = $bp->pages->activate->slug;
-                elseif ( defined( 'BP_ACTIVATION_SLUG' ) )
+                } elseif ( defined( 'BP_ACTIVATION_SLUG' ) ) {
                         $slug = BP_ACTIVATION_SLUG;
-                else
+                } else {
                         $slug = 'activate';
+                }
 
                 return apply_filters( 'bp_get_activate_slug', $slug );