Changeset 4776

Timestamp:

07/22/2011 08:02:33 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix bug where inbox count would return incorrect results. See #3367.

Location:

trunk/bp-messages

Files:

• bp-messages-classes.php (modified) (1 diff)
• bp-messages-loader.php (modified) (1 diff)

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

@@ -167 +167 @@
     }
 
-    function get_inbox_count() {
-        global $wpdb, $bp;
-
-        $sql = $wpdb->prepare( "SELECT unread_count FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0 AND sender_only = 0", $bp->loggedin_user->id );
-
-        if ( !$unread_counts = $wpdb->get_results($sql) )
-            return false;
-
-        $count = 0;
-        for ( $i = 0, $count = count( $unread_counts ); $i < $count; ++$i ) {
-            $count += $unread_counts[$i]->unread_count;
-        }
-
-        return $count;
+    function get_inbox_count( $user_id = 0 ) {
+        global $wpdb, $bp;
+
+        if ( empty( $user_id ) )
+            $user_id = $bp->loggedin_user->id;
+
+        $sql = $wpdb->prepare( "SELECT SUM(unread_count) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0 AND sender_only = 0", $user_id );
+        $unread_count = $wpdb->get_var( $sql );
+
+        if ( empty( $unread_count ) || is_wp_error( $unread_count ) )
+            return 0;
+
+        return (int) $unread_count;
     }
 

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

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