Changeset 6497

Timestamp:

11/08/2012 07:37:09 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove incorrect prepare() usages in bp-messages-classes.php.

File:

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

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

@@ -145 +145 @@
 
                 if ( $type == 'unread' )
-                        $type_sql = $wpdb->prepare( " AND r.unread_count != 0 " );
+                        $type_sql = " AND r.unread_count != 0 ";
                 elseif ( $type == 'read' )
-                        $type_sql = $wpdb->prepare( " AND r.unread_count = 0 " );
+                        $type_sql = " AND r.unread_count = 0 ";
 
                 if ( !empty( $search_terms ) ) {
@@ -200 +200 @@
 
                 if ( $type == 'unread' )
-                        $type_sql = $wpdb->prepare( " AND unread_count != 0 " );
+                        $type_sql = " AND unread_count != 0 ";
                 else if ( $type == 'read' )
-                        $type_sql = $wpdb->prepare( " AND unread_count = 0 " );
+                        $type_sql = " 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 ) );
@@ -283 +283 @@
                 $bp_prefix = bp_core_get_table_prefix();
                 $errors    = false;
-                $threads   = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp_prefix}bp_messages_threads" ) );
+                $threads   = $wpdb->get_results( "SELECT * FROM {$bp_prefix}bp_messages_threads" );
 
                 // Nothing to update, just return true to remove the table
@@ -358 +358 @@
                 // If we have no thread_id then this is the first message of a new thread.
                 if ( empty( $this->thread_id ) ) {
-                        $this->thread_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT MAX(thread_id) FROM {$bp->messages->table_name_messages}" ) ) + 1;
+                        $this->thread_id = (int) $wpdb->get_var( "SELECT MAX(thread_id) FROM {$bp->messages->table_name_messages}" ) + 1;
                         $new_thread = true;
                 }
@@ -540 +540 @@
                 }
 
-                $notices = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC {$limit_sql}" ) );
+                $notices = $wpdb->get_results( "SELECT * FROM {$bp->messages->table_name_notices} ORDER BY date_sent DESC {$limit_sql}" );
 
                 return $notices;
@@ -548 +548 @@
                 global $wpdb, $bp;
 
-                $notice_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices ) );
+                $notice_count = $wpdb->get_var( "SELECT COUNT(id) FROM " . $bp->messages->table_name_notices );
 
                 return $notice_count;
@@ -556 +556 @@
                 global $wpdb, $bp;
 
-                $notice_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1" ) );
+                $notice_id = $wpdb->get_var( "SELECT id FROM {$bp->messages->table_name_notices} WHERE is_active = 1" );
+
                 return new BP_Messages_Notice( $notice_id );
         }