Changeset 1021 for trunk/bp-messages/bp-messages-templatetags.php

Timestamp:

02/06/2009 03:07:48 AM (17 years ago)

Author:

apeatling

Message:

Converted $bp as an array to $bp as an object. See this post for more info: http://buddypress.org/forums/topic.php?id=1125

File:

• trunk/bp-messages/bp-messages-templatetags.php (modified) (9 diffs)

trunk/bp-messages/bp-messages-templatetags.php

@@ -98 +98 @@
     global $bp, $messages_template;
 
-    if ( $bp['current_action'] == 'notices' && !is_site_admin() ) {
-        wp_redirect( $bp['current_userid'] );
+    if ( $bp->current_action == 'notices' && !is_site_admin() ) {
+        wp_redirect( $bp->displayed_user->id );
     } else {
-        if ( $bp['current_action'] == 'inbox' )
-            bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'messages', 'new_message' );
-    
-        $messages_template = new BP_Messages_Template( $bp['loggedin_userid'], $bp['current_action'] );
+        if ( $bp->current_action == 'inbox' )
+            bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'messages', 'new_message' );
+    
+        $messages_template = new BP_Messages_Template( $bp->loggedin_user->id, $bp->current_action );
     }
     
@@ -147 +147 @@
 function bp_message_thread_view_link() {
     global $messages_template, $bp;
-    echo apply_filters( 'bp_message_thread_view_link', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/view/' . $messages_template->thread->thread_id );
+    echo apply_filters( 'bp_message_thread_view_link', $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . $messages_template->thread->thread_id );
 }
 
 function bp_message_thread_delete_link() {
     global $messages_template, $bp;
-    echo apply_filters( 'bp_message_thread_delete_link', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/' . $bp['current_action'] . '/delete/' . $messages_template->thread->thread_id );
+    echo apply_filters( 'bp_message_thread_delete_link', $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action . '/delete/' . $messages_template->thread->thread_id );
 }
 
@@ -197 +197 @@
     global $bp;
     
-    echo apply_filters( 'bp_messages_form_action', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/' . $bp['current_action'] );
+    echo apply_filters( 'bp_messages_form_action', $bp->loggedin_user->domain . $bp->messages->slug . '/' . $bp->current_action );
 }
 
@@ -219 +219 @@
     global $bp;
     
-    if ( $bp['current_action'] != 'sentbox' ) {
+    if ( $bp->current_action != 'sentbox' ) {
 ?>
         <?php _e( 'Select:', 'buddypress' ) ?> 
@@ -231 +231 @@
         <a href="#" id="mark_as_unread"><?php _e('Mark as Unread', 'buddypress') ?></a> &nbsp;
     <?php } ?>
-        <a href="#" id="delete_<?php echo $bp['current_action'] ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
+        <a href="#" id="delete_<?php echo $bp->current_action ?>_messages"><?php _e('Delete Selected', 'buddypress') ?></a> &nbsp;
 <?php   
 }
@@ -263 +263 @@
     global $messages_template, $bp;
     
-    echo apply_filters( 'bp_message_notice_delete_link', $bp['loggedin_domain'] . $bp['messages']['slug'] . '/notices/delete/' . $messages_template->thread->id );
+    echo apply_filters( 'bp_message_notice_delete_link', $bp->loggedin_user->domain . $bp->messages->slug . '/notices/delete/' . $messages_template->thread->id );
 }
 
@@ -270 +270 @@
 
     if ( $messages_template->thread->is_active == "1" ) {
-        $link = $bp['loggedin_domain'] . $bp['messages']['slug'] . '/notices/deactivate/' . $messages_template->thread->id;
+        $link = $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id;
     } else {
-        $link = $bp['loggedin_domain'] . $bp['messages']['slug'] . '/notices/activate/' . $messages_template->thread->id;       
+        $link = $bp->loggedin_user->domain . $bp->messages->slug . '/notices/activate/' . $messages_template->thread->id;       
     }
     echo apply_filters( 'bp_message_activate_deactivate_link', $link );
@@ -316 +316 @@
         return false;
     
-    $ud = get_userdata( $bp['current_userid'] ); 
+    $ud = get_userdata( $bp->displayed_user->id ); 
     ?>
     <div class="generic-button">
-        <a class="send-message" title="<?php _e( 'Send Message', 'buddypress' ) ?>" href="<?php echo $bp['loggedin_domain'] . $bp['messages']['slug'] ?>/compose/?r=<?php echo $ud->user_login ?>"><?php _e( 'Send Message', 'buddypress' ) ?></a>
+        <a class="send-message" title="<?php _e( 'Send Message', 'buddypress' ) ?>" href="<?php echo $bp->loggedin_user->domain . $bp->messages->slug ?>/compose/?r=<?php echo $ud->user_login ?>"><?php _e( 'Send Message', 'buddypress' ) ?></a>
     </div>
     <?php
@@ -326 +326 @@
 function bp_message_loading_image_src() {
     global $bp;
-    echo $bp['messages']['image_base'] . '/ajax-loader.gif';
+    echo $bp->messages->image_base . '/ajax-loader.gif';
 }