Changeset 13902

Timestamp:

06/03/2024 08:27:09 PM (10 months ago)

Author:

imath

Message:

Blogs: slightly improve the query to get network sites

Only include the sql part to query according to site descriptions when needed: when a search is performed.

Props lenasterg

Fixes #9136
Closes ​https://github.com/buddypress/buddypress/pull/272

File:

• trunk/src/bp-blogs/classes/class-bp-blogs-blog.php (modified) (3 diffs)

trunk/src/bp-blogs/classes/class-bp-blogs-blog.php

@@ -266 +266 @@
 
         if ( ! empty( $r['search_terms'] ) ) {
-            $search_terms_like = '%' . bp_esc_like( $r['search_terms'] ) . '%';
-            $search_terms_sql  = $wpdb->prepare( 'AND (bm_name.meta_value LIKE %s OR bm_description.meta_value LIKE %s)', $search_terms_like, $search_terms_like );
+            $search_terms_left_join = 'LEFT JOIN ' . $bp->blogs->table_name_blogmeta . ' bm_description ON (b.blog_id = bm_description.blog_id)';
+            $search_terms_like      = '%' . bp_esc_like( $r['search_terms'] ) . '%';
+            $search_terms_sql       = $wpdb->prepare(
+                'AND bm_description.meta_key = \'description\' AND (bm_name.meta_value LIKE %s OR bm_description.meta_value LIKE %s)',
+                $search_terms_like,
+                $search_terms_like
+            );
         } else {
-            $search_terms_sql = '';
+            $search_terms_left_join = '';
+            $search_terms_sql       = '';
         }
 
@@ -278 +284 @@
               LEFT JOIN {$bp->blogs->table_name_blogmeta} bm ON (b.blog_id = bm.blog_id)
               LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_name ON (b.blog_id = bm_name.blog_id)
-              LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_description ON (b.blog_id = bm_description.blog_id)
+              {$search_terms_left_join}
               LEFT JOIN {$wpdb->base_prefix}blogs wb ON (b.blog_id = wb.blog_id)
               LEFT JOIN {$wpdb->users} u ON (b.user_id = u.ID)
             WHERE
               wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql}
-              AND bm.meta_key = 'last_activity' AND bm_name.meta_key = 'name' AND bm_description.meta_key = 'description'
+              AND bm.meta_key = 'last_activity' AND bm_name.meta_key = 'name'
               {$search_terms_sql} {$user_sql} {$include_sql} {$date_query_sql}
             GROUP BY b.blog_id {$order_sql} {$pag_sql}
@@ -295 +301 @@
               LEFT JOIN {$bp->blogs->table_name_blogmeta} bm ON (b.blog_id = bm.blog_id)
               LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_name ON (b.blog_id = bm_name.blog_id)
-              LEFT JOIN {$bp->blogs->table_name_blogmeta} bm_description ON (b.blog_id = bm_description.blog_id)
+              {$search_terms_left_join}
             WHERE
               wb.archived = '0' AND wb.spam = 0 AND wb.mature = 0 AND wb.deleted = 0 {$hidden_sql}
-              AND bm.meta_key = 'last_activity' AND bm_name.meta_key = 'name' AND bm_description.meta_key = 'description'
+              AND bm.meta_key = 'last_activity' AND bm_name.meta_key = 'name'
               {$search_terms_sql} {$user_sql} {$include_sql} {$date_query_sql}
         " );