Changeset 9082

Timestamp:

10/14/2014 01:40:07 PM (10 years ago)

Author:

boonebgorges

Message:

Fix group meta query SQL manipulation.

The wildcard operators were acting too greedily, preventing some JOIN clauses
from being recognized and resulting in invalid SQL syntax. This problem had
previously been masked by ideosyncracies of WP's WP_Meta_Query SQL syntax,
which changed in ​[WP29887].

This change should be considered a band-aid fix for what is already a band-aid
fix. The proper resolution for this issue is to migrate away from the comma
syntax for JOINs used in BP_Groups_Group. See #5874, #5451.

File:

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

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

@@ -896 +896 @@
             // the more general query syntax to accord better with
             // BP/WP convention
-            preg_match_all( '/INNER JOIN (.*) ON/', $meta_sql['join'], $matches_a );
-            preg_match_all( '/ON \((.*)\)/', $meta_sql['join'], $matches_b );
+            preg_match_all( '/JOIN (.+?) ON/', $meta_sql['join'], $matches_a );
+            preg_match_all( '/ON \((.+?)\)/', $meta_sql['join'], $matches_b );
 
             if ( ! empty( $matches_a[1] ) && ! empty( $matches_b[1] ) ) {
                 $sql_array['join']  = implode( ',', $matches_a[1] ) . ', ';
-                $sql_array['where'] = $meta_sql['where'] . ' AND ' . implode ( ' AND ', $matches_b[1] );
+                $sql_array['where'] = $meta_sql['where'] . ' AND ' . implode( ' AND ', $matches_b[1] );
             }
         }