Changeset 2114 for trunk/bp-messages/bp-messages-classes.php

Timestamp:

11/24/2009 10:05:01 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch fixes into trunk.

File:

• trunk/bp-messages/bp-messages-classes.php (modified) (2 diffs)

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

@@ -235 +235 @@
                         $type_sql = $wpdb->prepare( " AND unread_count = 0 " );
 
-                return (int) $wpdb->get_var( $wpdb->prepare( "SELECT count(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0$exclude_sender $type_sql", $user_id ) );
+                return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(thread_id) FROM {$bp->messages->table_name_recipients} WHERE user_id = %d AND is_deleted = 0$exclude_sender $type_sql", $user_id ) );
         }
 
@@ -557 +557 @@
                 global $wpdb, $bp;
 
-                $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp->messages->table_name_notices ) );
+                $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices ) );
+
                 return $notice_count;
         }