Changeset 8476

Timestamp:

06/04/2014 06:24:12 PM (10 years ago)

Author:

boonebgorges

Message:

Clean up parsed meta_query clauses before performing preg_replaces() in BP_Groups_Group::get_meta_query_sql()

Some weaknesses in parsing were exposed by upstream changes. See
​https://core.trac.wordpress.org/ticket/25538#comment:23.

This changeset makes the parsing less brittle by relying less on the details of
the line breaks introduced by WP into the query string.

See #5682

File:

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

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

@@ -897 +897 @@
 
                 $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 ] ) );