Changeset 6518

Timestamp:

11/14/2012 08:04:09 PM (13 years ago)

Author:

djpaul

Message:

Fix more prepare() warnings. See #4654

Location:

trunk

Files:

• bp-friends/bp-friends-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (3 diffs)

trunk/bp-friends/bp-friends-classes.php

@@ -85 +85 @@
 
         if ( !empty( $friend_requests_only ) ) {
-            $oc_sql = $wpdb->prepare( "AND is_confirmed = 0" );
-            $friend_sql = $wpdb->prepare ( " WHERE friend_user_id = %d", $user_id );
-        } else {
-            $oc_sql = $wpdb->prepare( "AND is_confirmed = 1" );
-            $friend_sql = $wpdb->prepare ( " WHERE (initiator_user_id = %d OR friend_user_id = %d)", $user_id, $user_id );
-        }
-
-        $friends = $wpdb->get_results( $wpdb->prepare( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} $friend_sql $oc_sql ORDER BY date_created DESC" ) );
+            $oc_sql = 'AND is_confirmed = 0';
+            $friend_sql = $wpdb->prepare( " WHERE friend_user_id = %d", $user_id );
+        } else {
+            $oc_sql = 'AND is_confirmed = 1';
+            $friend_sql = $wpdb->prepare( " WHERE (initiator_user_id = %d OR friend_user_id = %d)", $user_id, $user_id );
+        }
+
+        $friends = $wpdb->get_results( "SELECT friend_user_id, initiator_user_id FROM {$bp->friends->table_name} $friend_sql $oc_sql ORDER BY date_created DESC" );
         $fids = array();
 

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -137 +137 @@
 
         if ( !empty( $hide_empty_groups ) )
-            $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC" ) );
+            $groups = $wpdb->get_results( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g INNER JOIN {$bp->profile->table_name_fields} f ON g.id = f.group_id {$where_sql} ORDER BY g.group_order ASC" );
         else
-            $groups = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" ) );
+            $groups = $wpdb->get_results( "SELECT DISTINCT g.* FROM {$bp->profile->table_name_groups} g {$where_sql} ORDER BY g.group_order ASC" );
 
         if ( empty( $fetch_fields ) )
@@ -171 +171 @@
 
         // Fetch the fields
-        $fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, name, description, type, group_id, is_required FROM {$bp->profile->table_name_fields} WHERE group_id IN ( {$group_ids} ) AND parent_id = 0 {$exclude_fields_sql} ORDER BY field_order" ) );
+        $fields = $wpdb->get_results( "SELECT id, name, description, type, group_id, is_required FROM {$bp->profile->table_name_fields} WHERE group_id IN ( {$group_ids} ) AND parent_id = 0 {$exclude_fields_sql} ORDER BY field_order" );
 
         if ( empty( $fields ) )
@@ -331 +331 @@
         global $wpdb, $bp;
 
-        $levels = $wpdb->get_results( $wpdb->prepare( "SELECT object_id, meta_key, meta_value FROM {$bp->profile->table_name_meta} WHERE object_type = 'field' AND ( meta_key = 'default_visibility' OR meta_key = 'allow_custom_visibility' )" ) );
+        $levels = $wpdb->get_results( "SELECT object_id, meta_key, meta_value FROM {$bp->profile->table_name_meta} WHERE object_type = 'field' AND ( meta_key = 'default_visibility' OR meta_key = 'allow_custom_visibility' )" );
 
         // Arrange so that the field id is the key and the visibility level the value