Changeset 6557 for branches/1.6/bp-messages/bp-messages-classes.php

Timestamp:

12/04/2012 12:03:40 PM (13 years ago)

Author:

djpaul

Message:

Fix alot of WPDB->Prepare() warnings in the 1.6 branch. See #4654

File:

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

branches/1.6/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;
         }
@@ -539 +539 @@
         }
 
-        $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;
@@ -547 +547 @@
         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;
@@ -555 +555 @@
         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 );
     }