Changeset 6557 for branches/1.6/bp-groups/bp-groups-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-groups/bp-groups-classes.php (modified) (7 diffs)

branches/1.6/bp-groups/bp-groups-classes.php

@@ -177 +177 @@
 
         // Modify group count usermeta for members
-        $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->usermeta} SET meta_value = meta_value - 1 WHERE meta_key = 'total_group_count' AND user_id IN ( {$user_id_str} )" ) );
+        $wpdb->query( "UPDATE {$wpdb->usermeta} SET meta_value = meta_value - 1 WHERE meta_key = 'total_group_count' AND user_id IN ( {$user_id_str} )" );
 
         // Now delete all group member entries
@@ -235 +235 @@
         $gids = implode( ',', $gids['groups'] );
 
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids}) {$pag_sql}" ) );
-        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids})" ) );
+        $paged_groups = $wpdb->get_results( "SELECT id as group_id FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids}) {$pag_sql}" );
+        $total_groups = $wpdb->get_var( "SELECT COUNT(id) FROM {$bp->groups->table_name} WHERE ( name LIKE '{$filter}%%' OR description LIKE '{$filter}%%' ) AND id IN ({$gids})" );
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -533 +533 @@
 
         if ( !bp_current_user_can( 'bp_moderate' ) )
-            $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
+            $hidden_sql = " AND status != 'hidden'";
 
         $letter = like_escape( $wpdb->escape( $letter ) );
@@ -539 +539 @@
         if ( !empty( $limit ) && !empty( $page ) ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql}" ) );
-        }
-
-        $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
+            $total_groups = $wpdb->get_var( "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql}" );
+        }
+
+        $paged_groups = $wpdb->get_results( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g WHERE g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} {$exclude_sql} ORDER BY g.name ASC {$pag_sql}" );
 
         if ( !empty( $populate_extras ) ) {
@@ -637 +637 @@
             $hidden_sql = "WHERE status != 'hidden'";
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql}" ) );
+        return $wpdb->get_var( "SELECT COUNT(id) FROM {$bp->groups->table_name} {$hidden_sql}" );
     }
 
@@ -692 +692 @@
 
             case 'hidden' :
-                $status_sql = $wpdb->prepare( "AND g.status = 'hidden'" );
+                $status_sql = "AND g.status = 'hidden'";
                 break;
 
             case 'private' :
-                $status_sql = $wpdb->prepare( "AND g.status = 'private'" );
+                $status_sql = "AND g.status = 'private'";
                 break;
 
             case 'public' :
             default :
-                $status_sql = $wpdb->prepare( "AND g.status = 'public'" );
+                $status_sql = "AND g.status = 'public'";
                 break;
         }
@@ -1174 +1174 @@
         $exclude_admins_sql = '';
         if ( !empty( $exclude_admins_mods ) )
-            $exclude_admins_sql = $wpdb->prepare( "AND is_admin = 0 AND is_mod = 0" );
+            $exclude_admins_sql = "AND is_admin = 0 AND is_mod = 0";
 
         $banned_sql = '';
         if ( !empty( $exclude_banned ) )
-            $banned_sql = $wpdb->prepare( " AND is_banned = 0" );
+            $banned_sql = " AND is_banned = 0";
 
         $exclude_sql = '';
         if ( !empty( $exclude ) )
-            $exclude_sql = $wpdb->prepare( " AND m.user_id NOT IN ({$exclude})" );
+            $exclude_sql = " AND m.user_id NOT IN ({$exclude})";
 
         if ( bp_is_active( 'xprofile' ) )