Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
01/21/2014 10:30:13 PM (11 years ago)
Author:
johnjamesjacoby
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.9/bp-members/bp-members-template.php

    r7513 r7749  
    3333     */
    3434    function bp_get_members_slug() {
    35         global $bp;
    36         return apply_filters( 'bp_get_members_slug', $bp->members->slug );
     35        return apply_filters( 'bp_get_members_slug', buddypress()->members->slug );
    3736    }
    3837
     
    5756     */
    5857    function bp_get_members_root_slug() {
    59         global $bp;
    60         return apply_filters( 'bp_get_members_root_slug', $bp->members->root_slug );
     58        return apply_filters( 'bp_get_members_root_slug', buddypress()->members->root_slug );
    6159    }
    6260
     
    110108        $bp = buddypress();
    111109
    112         if ( !empty( $bp->pages->register->slug ) )
     110        if ( !empty( $bp->pages->register->slug ) ) {
    113111            $slug = $bp->pages->register->slug;
    114         elseif ( defined( 'BP_REGISTER_SLUG' ) )
     112        } elseif ( defined( 'BP_REGISTER_SLUG' ) ) {
    115113            $slug = BP_REGISTER_SLUG;
    116         else
     114        } else {
    117115            $slug = 'register';
     116        }
    118117
    119118        return apply_filters( 'bp_get_signup_slug', $slug );
     
    140139     */
    141140    function bp_get_activate_slug() {
    142         global $bp;
    143 
    144         if ( !empty( $bp->pages->activate->slug ) )
     141        $bp = buddypress();
     142
     143        if ( !empty( $bp->pages->activate->slug ) ) {
    145144            $slug = $bp->pages->activate->slug;
    146         elseif ( defined( 'BP_ACTIVATION_SLUG' ) )
     145        } elseif ( defined( 'BP_ACTIVATION_SLUG' ) ) {
    147146            $slug = BP_ACTIVATION_SLUG;
    148         else
     147        } else {
    149148            $slug = 'activate';
     149        }
    150150
    151151        return apply_filters( 'bp_get_activate_slug', $slug );
Note: See TracChangeset for help on using the changeset viewer.