Changeset 2502

Timestamp:

01/31/2010 08:08:28 PM (17 years ago)

Author:

apeatling

Message:

Messaging sentbox fix and various other minor fixes.

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)
• bp-messages/bp-messages-classes.php (modified) (1 diff)
• bp-themes/bp-default/members/single/messages/messages-loop.php (modified) (1 diff)

trunk/bp-activity.php

@@ -629 +629 @@
         /* Send an email notification if settings allow */
         require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-notifications.php' );
-        bp_activity_new_comment_notification( $comment_id, $params );
+        bp_activity_new_comment_notification( $comment_id, $user_id, $params );
 
         do_action( 'bp_activity_comment_posted', $comment_id, $params );

trunk/bp-activity/bp-activity-classes.php

@@ -27 +27 @@
 
                 $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
-
-                if ( $activity ) {
+                if ( $row ) {
                         $this->id = $row->id;
                         $this->item_id = $row->item_id;

trunk/bp-groups/bp-groups-notifications.php

@@ -238 +238 @@
 
                 // Now email the user with the contents of the message (if they have enabled email notifications)
-                if ( !get_usermeta( $user_id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $user_id, 'notification_activity_new_mention' ) ) {
+                if ( 'no' != get_usermeta( $user_id, 'notification_activity_new_mention' ) ) {
                         $poster_name = bp_core_get_user_displayname( $poster_user_id );
 

trunk/bp-messages/bp-messages-classes.php

@@ -191 +191 @@
         function get_recipient_links($recipients) {
                 if ( count($recipients) >= 5 )
-                        return count($recipients) . __(' Recipients', 'buddypress');
-
-                        for ( $i = 0; $i < count($recipients); $i++ ) {
-                        $recipient_links[] = bp_core_get_userlink( $recipients[$i] );
+                        return count( $recipients ) . __(' Recipients', 'buddypress');
+
+                foreach ( $recipients as $recipient ) {
+                        $recipient_links[] = bp_core_get_userlink( $recipient->user_id );
                 }
 

trunk/bp-themes/bp-default/members/single/messages/messages-loop.php

@@ -26 +26 @@
                                 </td>
                                 <td width="1%" class="thread-avatar"><?php bp_message_thread_avatar() ?></td>
-                                <td width="30%" class="thread-from">
-                                        <?php _e( 'From:', 'buddypress' ); ?> <?php bp_message_thread_from() ?><br />
-                                        <span class="activity"><?php bp_message_thread_last_post_date() ?></span>
-                                </td>
+
+                                <?php if ( 'sentbox' != bp_current_action() ) : ?>
+                                        <td width="30%" class="thread-from">
+                                                <?php _e( 'From:', 'buddypress' ); ?> <?php bp_message_thread_from() ?><br />
+                                                <span class="activity"><?php bp_message_thread_last_post_date() ?></span>
+                                        </td>
+                                <?php else: ?>
+                                        <td width="30%" class="thread-from">
+                                                <?php _e( 'To:', 'buddypress' ); ?> <?php bp_message_thread_to() ?><br />
+                                                <span class="activity"><?php bp_message_thread_last_post_date() ?></span>
+                                        </td>
+                                <?php endif; ?>
+
                                 <td width="50%" class="thread-info">
                                         <p><a href="<?php bp_message_thread_view_link() ?>" title="<?php _e( "View Message", "buddypress" ); ?>"><?php bp_message_thread_subject() ?></a></p>