Changeset 4391 for trunk/bp-core/admin/bp-core-update.php

Timestamp:

05/19/2011 05:01:39 PM (14 years ago)

Author:

boonebgorges

Message:

Modifies schema queries to use the filtered bp_core_get_table_prefix(). Fixes #3228. Props wpmuguru

File:

• trunk/bp-core/admin/bp-core-update.php (modified) (2 diffs)

trunk/bp-core/admin/bp-core-update.php

@@ -1099 +1099 @@
 
 function bp_update_db_stuff() {
+    $bp_prefix = bp_core_get_table_prefix();
     // Rename the old user activity cached table if needed.
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$wpdb->base_prefix}bp_activity_user_activity_cached%'" ) )
-        $wpdb->query( "RENAME TABLE {$wpdb->base_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_activity_user_activity_cached%'" ) )
+        $wpdb->query( "RENAME TABLE {$bp_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
 
     // Rename fields from pre BP 1.2
@@ -1122 +1123 @@
 
     // Update and remove the message threads table if it exists
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$wpdb->base_prefix}bp_messages_threads%'" ) ) {
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_messages_threads%'" ) ) {
         $update = BP_Messages_Thread::update_tables();
 
         if ( $update )
-            $wpdb->query( "DROP TABLE {$wpdb->base_prefix}bp_messages_threads" );
+            $wpdb->query( "DROP TABLE {$bp_prefix}bp_messages_threads" );
     }