Ticket #5563: 5563.03.patch

bp-core/admin/bp-core-schema.php

@@ -52 +52 @@
                 bp_core_install_blog_tracking();
 
         // Install the signups table
-        bp_core_install_signups();
+        bp_core_maybe_install_signups();
 
 }
 

bp-core/bp-core-update.php

@@ -490 +490 @@
                 return false;
         }
 
+        // Upgrade the signups table if needed
+        bp_core_maybe_upgrade_signups();
+
         // Try to install the sign-ups table
         if ( ! is_multisite() && ! bp_core_signups_table_exists() ) {
                 bp_core_install_signups();
@@ -523 +526 @@
                 return false;
         }
 
-        // Actually upgrade the sign-ups table
-        if ( bp_core_maybe_install_signups() ) {
+        // check if 'wp_signups' table exists
+        if ( bp_core_signups_table_exists() ) {
+                global $wpdb;
+
+                // Never use bp_core_get_table_prefix() for any global users tables
+                $wpdb->signups = $wpdb->base_prefix . 'signups';
+
+                // 'signup_id' column already exists; stop now!
+                // @see https://core.trac.wordpress.org/changeset/25179
+                if ( 1 === $wpdb->query( "SHOW COLUMNS FROM {$wpdb->signups} LIKE 'signup_id'" ) ) {
+                        return false;
+                }
+
+                // We need to upgrade the signups table
                 bp_core_upgrade_signups();
+                return true;
+
+        // 'wp_signups' table doesn't exist
+        } else {
+                return false;
         }
 
-        // Return whether or not the table exists now
-        return (bool) bp_core_signups_table_exists();
 }
 
 /** Activation Actions ********************************************************/