| @@ -16,18 +16,25 @@ | ||
| 16 | 16 | * Delete options in database. |
| 17 | 17 | */ |
| 18 | 18 | delete_option( 'auth_settings' ); |
| 19 | 19 | delete_option( 'auth_settings_recently_sent_emails' ); |
| 20 | -delete_option( 'auth_settings_advanced_admin_notice' ); | |
| 21 | 20 | delete_option( 'auth_settings_advanced_login_error' ); |
| 22 | 21 | delete_option( 'auth_settings_advanced_lockouts_time_last_failed' ); |
| 23 | 22 | delete_option( 'auth_settings_advanced_lockouts_failed_attempts' ); |
| 23 | +delete_option( 'auth_settings_access_users_approved' ); | |
| 24 | +delete_option( 'auth_settings_access_users_blocked' ); | |
| 25 | +delete_option( 'auth_settings_access_users_pending' ); | |
| 26 | +delete_option( 'auth_settings_advanced_public_notice' ); | |
| 27 | +delete_option( 'auth_settings_advanced_admin_notice' ); | |
| 28 | +delete_option( 'auth_version' ); | |
| 24 | 29 | |
| 25 | 30 | /** |
| 26 | 31 | * Delete multisite options. |
| 27 | 32 | */ |
| 28 | 33 | if ( is_multisite() ) { |
| 29 | - delete_blog_option( BLOG_ID_CURRENT_SITE, 'auth_multisite_settings' ); | |
| 34 | + delete_blog_option( get_main_site_id( get_main_network_id() ), 'auth_multisite_settings' ); | |
| 35 | + delete_blog_option( get_main_site_id( get_main_network_id() ), 'auth_multisite_settings_access_users_approved' ); | |
| 36 | + delete_blog_option( get_main_site_id( get_main_network_id() ), 'auth_version' ); | |
| 30 | 37 | } |
| 31 | 38 | |
| 32 | 39 | /** |
| 33 | 40 | * For security, delete blocked users (since we can't enforce their blocked |
| @@ -35,13 +42,13 @@ | ||
| 35 | 42 | * their passwords and log in). If they have any content, reassign it to the |
| 36 | 43 | * current user (the user uninstalling the plugin). |
| 37 | 44 | */ |
| 38 | 45 | if ( ! is_multisite() ) { |
| 39 | - $current_user = wp_get_current_user(); | |
| 46 | + $reassign_user = wp_get_current_user(); | |
| 40 | 47 | $blocked_users = get_users( array( |
| 41 | - 'meta_key' => 'auth_blocked', | |
| 42 | - 'meta_value' => 'yes', | |
| 43 | - )); | |
| 48 | + 'meta_key' => 'auth_blocked', // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key | |
| 49 | + 'meta_value' => 'yes', // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_value | |
| 50 | + ) ); | |
| 44 | 51 | foreach ( $blocked_users as $blocked_user ) { |
| 45 | - wp_delete_user( $blocked_user->ID, $current_user->ID ); | |
| 52 | + wp_delete_user( $blocked_user->ID, $reassign_user->ID ); | |
| 46 | 53 | } |
| 47 | 54 | } |