Changeset 5704 for trunk/bp-xprofile/bp-xprofile-template.php

Timestamp:

02/11/2012 02:45:59 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Replace direct references to $bp user domains with their functional equivalents. See #3994.

File:

• trunk/bp-xprofile/bp-xprofile-template.php (modified) (5 diffs)

trunk/bp-xprofile/bp-xprofile-template.php

@@ -268 +268 @@
         global $bp, $group;
 
-        return apply_filters( 'bp_get_the_profile_group_edit_form_action', trailingslashit( $bp->displayed_user->domain . $bp->profile->slug . '/edit/group/' . $group->id ) );
+        return apply_filters( 'bp_get_the_profile_group_edit_form_action', trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit/group/' . $group->id ) );
     }
 
@@ -743 +743 @@
 
         if ( !empty( $groups[$i]->fields ) ) {
-            $link = trailingslashit( $bp->displayed_user->domain . $bp->profile->slug . '/edit/group/' . $groups[$i]->id );
+            $link = trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit/group/' . $groups[$i]->id );
             $tabs[] = sprintf( '<li %1$s><a href="%2$s">%3$s</a></li>', $selected, $link, esc_html( $groups[$i]->name ) );
         }
@@ -781 +781 @@
 
     if ( !(int)$bp->site_options['bp-disable-avatar-uploads'] )
-        bp_core_avatar_admin( null, $bp->loggedin_user->domain . $bp->profile->slug . '/change-avatar/', $bp->loggedin_user->domain . $bp->profile->slug . '/delete-avatar/' );
+        bp_core_avatar_admin( null, bp_loggedin_user_domain() . $bp->profile->slug . '/change-avatar/', bp_loggedin_user_domain() . $bp->profile->slug . '/delete-avatar/' );
     else
         _e( 'Avatar uploads are currently disabled. Why not use a <a href="http://gravatar.com" target="_blank">gravatar</a> instead?', 'buddypress' );
@@ -822 +822 @@
         global $bp;
 
-        return apply_filters( 'bp_get_avatar_delete_link', wp_nonce_url( $bp->displayed_user->domain . $bp->profile->slug . '/change-avatar/delete-avatar/', 'bp_delete_avatar_link' ) );
+        return apply_filters( 'bp_get_avatar_delete_link', wp_nonce_url( bp_displayed_user_domain() . $bp->profile->slug . '/change-avatar/delete-avatar/', 'bp_delete_avatar_link' ) );
     }
 
@@ -841 +841 @@
         'must_be_logged_in' => true,
         'block_self'        => true,
-        'link_href'         => trailingslashit( $bp->displayed_user->domain . $bp->profile->slug . '/edit' ),
+        'link_href'         => trailingslashit( bp_displayed_user_domain() . $bp->profile->slug . '/edit' ),
         'link_class'        => 'edit',
         'link_text'         => __( 'Edit Profile', 'buddypress' ),