Changeset 8949 for trunk/src/bp-groups/bp-groups-classes.php

Timestamp:

08/20/2014 06:32:30 PM (12 years ago)

Author:

boonebgorges

Message:

Simplify logic that transforms WP_Meta_Query SQL for Groups queries

This simplified logic fixes a bug related to the use of the 'compare'
operator in certain cases.

Fixes #5824

Props imath

File:

• trunk/src/bp-groups/bp-groups-classes.php (modified) (1 diff)

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

@@ -892 +892 @@
 
                         if ( ! empty( $matches_a[1] ) && ! empty( $matches_b[1] ) ) {
-                                $sql_array['join']  = implode( ',', $matches_a[1] ). ', ';
-
-                                $sql_array['where'] = '';
-
-                                $meta_query_where_clauses = explode( "\n", $meta_sql['where'] );
-
-                                // Trim empties
-                                $meta_query_where_clauses = array_values( array_filter( $meta_query_where_clauses ) );
-
-                                foreach( $matches_b[1] as $key => $group_id_clause ) {
-                                        $sql_array['where'] .= ' ' . preg_replace( '/^(AND\s+[\(\s]+)/', '$1' . $group_id_clause . ' AND ', ltrim( $meta_query_where_clauses[ $key ] ) );
-                                }
-
+                                $sql_array['join']  = implode( ',', $matches_a[1] ) . ', ';
+                                $sql_array['where'] = $meta_sql['where'] . ' AND ' . implode ( ' AND ', $matches_b[1] );
                         }
                 }