Changeset 12180

Timestamp:

07/02/2018 06:07:46 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Meta: Prefer internal table references over $wpdb ones.

This change updates a few direct database queries to reference the database table names internally set by BP_Component rather than what's been passed into the $wpdb global.

We want to use these everywhere, as they are already in use everywhere else direct queries are made.

Blogs, Groups, and Messages meta deletion functions are affected.

See #7834.

Location:

trunk/src

Files:

• bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• bp-core/classes/class-bp-component.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• bp-messages/bp-messages-functions.php (modified) (1 diff)

trunk/src/bp-blogs/bp-blogs-functions.php

@@ -1303 +1303 @@
     // Legacy - if no meta_key is passed, delete all for the blog_id.
     if ( empty( $meta_key ) ) {
-        $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->bp_blogmeta} WHERE blog_id = %d", $blog_id ) );
+        $table_name = buddypress()->blogs->table_name_blogmeta;
+        $sql        = "SELECT meta_key FROM {$table_name} WHERE blog_id = %d";
+        $query      = $wpdb->prepare( $sql, $blog_id );
+        $keys       = $wpdb->get_col( $query );
+
+        // With no meta_key, ignore $delete_all.
         $delete_all = false;
     } else {

trunk/src/bp-core/classes/class-bp-component.php

@@ -662 +662 @@
         if ( !empty( $tables ) && is_array( $tables ) ) {
             foreach ( $tables as $global_name => $table_name ) {
-                $this->$global_name = $table_name;
+                $this->{$global_name} = $table_name;
             }
 

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

@@ -2117 +2117 @@
     // Legacy - if no meta_key is passed, delete all for the item.
     if ( empty( $meta_key ) ) {
-        $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->groupmeta} WHERE group_id = %d", $group_id ) );
+        $table_name = buddypress()->groups->table_name_groupmeta;
+        $sql        = "SELECT meta_key FROM {$table_name} WHERE group_id = %d";
+        $query      = $wpdb->prepare( $sql, $group_id );
+        $keys       = $wpdb->get_col( $query );
 
         // With no meta_key, ignore $delete_all.

trunk/src/bp-messages/bp-messages-functions.php

@@ -450 +450 @@
  */
 function bp_messages_delete_meta( $message_id, $meta_key = false, $meta_value = false, $delete_all = false ) {
+    global $wpdb;
+
     // Legacy - if no meta_key is passed, delete all for the item.
     if ( empty( $meta_key ) ) {
-        global $wpdb;
-
-        $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->messagemeta} WHERE message_id = %d", $message_id ) );
+        $table_name = buddypress()->messages->table_name_meta;
+        $sql        = "SELECT meta_key FROM {$table_name} WHERE message_id = %d";
+        $query      = $wpdb->prepare( $sql, $message_id );
+        $keys       = $wpdb->get_col( $query );
 
         // With no meta_key, ignore $delete_all.