Changeset 5704 for trunk/bp-themes/bp-default/_inc/ajax.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-themes/bp-default/_inc/ajax.php (modified) (5 diffs)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -116 +116 @@
     switch ( $scope ) {
         case 'friends':
-            $feed_url = $bp->loggedin_user->domain . bp_get_activity_slug() . '/friends/feed/';
+            $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/friends/feed/';
             break;
         case 'groups':
-            $feed_url = $bp->loggedin_user->domain . bp_get_activity_slug() . '/groups/feed/';
+            $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/groups/feed/';
             break;
         case 'favorites':
-            $feed_url = $bp->loggedin_user->domain . bp_get_activity_slug() . '/favorites/feed/';
+            $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/feed/';
             break;
         case 'mentions':
-            $feed_url = $bp->loggedin_user->domain . bp_get_activity_slug() . '/mentions/feed/';
+            $feed_url = bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/feed/';
             bp_activity_clear_new_mentions( bp_loggedin_user_id() );
             break;
@@ -439 +439 @@
         echo '<span class="activity">' . esc_attr( $user->last_active ) . '</span>';
         echo '<div class="action">
-                <a class="button remove" href="' . wp_nonce_url( $bp->loggedin_user->domain . bp_get_groups_slug() . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . esc_attr( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
+                <a class="button remove" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_groups_slug() . '/' . $_POST['group_id'] . '/invites/remove/' . $user->id, 'groups_invite_uninvite_user' ) . '" id="uid-' . esc_attr( $user->id ) . '">' . __( 'Remove Invite', 'buddypress' ) . '</a>
               </div>';
         echo '</li>';
@@ -467 +467 @@
             echo __("Friendship could not be canceled.", 'buddypress');
         } else {
-            echo '<a id="friend-' . $_POST['fid'] . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . wp_nonce_url( $bp->loggedin_user->domain . bp_get_friends_slug() . '/add-friend/' . $_POST['fid'], 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
+            echo '<a id="friend-' . $_POST['fid'] . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/add-friend/' . $_POST['fid'], 'friends_add_friend' ) . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
         }
 
@@ -477 +477 @@
             echo __("Friendship could not be requested.", 'buddypress');
         } else {
-            echo '<a href="' . $bp->loggedin_user->domain . bp_get_friends_slug() . '/requests" class="requested">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
+            echo '<a href="' . bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests" class="requested">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
         }
     } else {
@@ -589 +589 @@
                 <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?>
 
-                <strong><a href="<?php echo $bp->loggedin_user->domain ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ) ?></span></strong>
+                <strong><a href="<?php echo bp_loggedin_user_domain() ?>"><?php echo $bp->loggedin_user->fullname ?></a> <span class="activity"><?php printf( __( 'Sent %s', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ) ?></span></strong>
 
                 <?php do_action( 'bp_after_message_meta' ) ?>