Changeset 7052

Timestamp:

05/11/2013 11:42:36 AM (13 years ago)

Author:

boonebgorges

Message:

Don't use extract() in BP_Groups_Group::get()

extract() is not cool.

File:

• trunk/bp-groups/bp-groups-classes.php (modified) (9 diffs)

trunk/bp-groups/bp-groups-classes.php

@@ -346 +346 @@
 
                 $r = wp_parse_args( $args, $defaults );
-                extract( $r );
 
                 $sql       = array();
@@ -354 +353 @@
                 $sql['from']   = " FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2,";
 
-                if ( !empty( $user_id ) )
+                if ( !empty( $r['user_id'] ) )
                         $sql['members_from'] = " {$bp->groups->table_name_members} m,";
 
                 $sql['group_from'] = " {$bp->groups->table_name} g WHERE";
 
-                if ( !empty( $user_id ) )
+                if ( !empty( $r['user_id'] ) )
                         $sql['user_where'] = " g.id = m.group_id AND";
 
                 $sql['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'";
 
-                if ( empty( $show_hidden ) )
+                if ( empty( $r['show_hidden'] ) )
                         $sql['hidden'] = " AND g.status != 'hidden'";
 
-                if ( !empty( $search_terms ) ) {
-                        $search_terms = esc_sql( like_escape( $search_terms ) );
+                if ( !empty( $r['search_terms'] ) ) {
+                        $search_terms = esc_sql( like_escape( $r['search_terms'] ) );
                         $sql['search'] = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
                 }
 
-                $meta_query_sql = self::get_meta_query_sql( $meta_query );
+                $meta_query_sql = self::get_meta_query_sql( $r['meta_query'] );
 
                 if ( ! empty( $meta_query_sql['join'] ) ) {
@@ -383 +382 @@
                 }
 
-                if ( !empty( $user_id ) )
-                        $sql['user'] = $wpdb->prepare( " AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id );
-
-                if ( !empty( $include ) ) {
+                if ( !empty( $r['user_id'] ) )
+                        $sql['user'] = $wpdb->prepare( " AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $r['user_id'] );
+
+                if ( !empty( $r['include'] ) ) {
                         $include        = wp_parse_id_list( $r['include'] );
                         $include        = $wpdb->escape( implode( ',', $include ) );
@@ -392 +391 @@
                 }
 
-                if ( !empty( $exclude ) ) {
+                if ( !empty( $r['exclude'] ) ) {
                         $exclude        = wp_parse_id_list( $r['exclude'] );
                         $exclude        = $wpdb->escape( implode( ',', $exclude ) );
@@ -398 +397 @@
                 }
 
-                switch ( $type ) {
+                switch ( $r['type'] ) {
                         case 'newest': default:
                                 $sql['order'] = " ORDER BY g.date_created DESC";
@@ -416 +415 @@
                 }
 
-                if ( !empty( $per_page ) && !empty( $page ) )
-                        $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page), intval( $per_page ) );
+                if ( !empty( $r['per_page'] ) && !empty( $r['page'] ) )
+                        $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $r['page'] - 1 ) * $r['per_page']), intval( $r['per_page'] ) );
 
                 // Get paginated results
@@ -425 +424 @@
                 $total_sql['select'] = "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name} g, {$bp->groups->table_name_members} gm1, {$bp->groups->table_name_groupmeta} gm2";
 
-                if ( !empty( $user_id ) )
+                if ( !empty( $r['user_id'] ) )
                         $total_sql['select'] .= ", {$bp->groups->table_name_members} m";
 
@@ -434 +433 @@
                         $total_sql['where'][] = "( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
 
-                if ( !empty( $user_id ) )
+                if ( !empty( $r['user_id'] ) )
                         $total_sql['where'][] = "m.group_id = g.id AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0";
 
@@ -464 +463 @@
 
                 // Populate some extra information instead of querying each time in the loop
-                if ( !empty( $populate_extras ) ) {
+                if ( !empty( $r['populate_extras'] ) ) {
                         $group_ids = $wpdb->escape( join( ',', (array) $group_ids ) );
-                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, $type );
+                        $paged_groups = BP_Groups_Group::get_group_extras( $paged_groups, $group_ids, $r['type'] );
                 }