Approving users before activation may be causing "invalid activation key" errors

[tw2113]

Looks like us handing ham/spam status, is setting the user_status value in the database to 0. Then when BuddyPress is working to process an activation code, it tries to update the user status as well, inside bp_core_activate_signup(). That doesn't fail, but $wpdb->query returns integer zero for how many rows it affected. That gets interpreted as false and thus BuddyPress throws an invalid key error.

Unsure how we can handle this, other than perhaps adding in messaging about users who have not activated yet, for the site admins. Or if we can somehow change the "invalid activation key" messaging to indicate the user is already active thanks to the site admins.