Changeset 4782

Timestamp:

07/22/2011 09:20:56 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Fix issue where private messages could not be marked as read, unread, or deleted. See #3367, #3241.

Location:

trunk

Files:

• bp-messages/bp-messages-loader.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

trunk/bp-messages/bp-messages-loader.php

@@ -89 +89 @@
                 global $bp;
 
-                if ( $count = bp_get_total_unread_messages_count() )
-                        $name = sprintf( __( 'Messages <span class="count">%s</span>', 'buddypress' ), $count );
-                else
-                        $name = __( 'Messages', 'buddypress' );
+                $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
 
                 // Add 'Messages' to the main navigation

trunk/bp-themes/bp-default/_inc/global.js

@@ -924 +924 @@
                                         jq('tr#m-' + jq(this).attr('value') + ' td span.unread-count').html(unreadCount);
                                         jq('tr#m-' + jq(this).attr('value') + ' td span.unread-count').css('display', unreadCountDisplay);
-                                        var inboxcount = jq('a#user-messages strong').html().substr( 1, jq('a#user-messages strong').html().length );
+
+                                        var inboxcount = jq('a#user-messages span').html().substr( 1, jq('a#user-messages span').html().length );
                                         var inboxcount = inboxcount.substr( 0, inboxcount.length - 1 );
 
                                         if ( !inboxcount.length )
                                                 inboxcount = 0;
+
                                         if ( parseInt(inboxcount) == inboxCount ) {
-                                                jq('a#user-messages strong').css('display', unreadCountDisplay);
-                                                jq('a#user-messages strong').html( '(' + unreadCount + ')' );
+                                                jq('a#user-messages span').css('display', unreadCountDisplay);
+                                                jq('a#user-messages span').html( unreadCount );
                                         } else {
                                                 if ( 'read' == currentClass )
-                                                        jq('a#user-messages strong').html('(' + ( parseInt(inboxcount) + 1 ) + ')');
+                                                        jq('a#user-messages span').html( ( parseInt(inboxcount) + 1 ) );
                                                 else
-                                                        jq('a#user-messages strong').html('(' + ( parseInt(inboxcount) - thread_count ) + ')');
+                                                        jq('a#user-messages span').html( ( parseInt(inboxcount) - thread_count ) );
                                         }