| @@ -45,21 +45,21 @@ | ||
| 45 | 45 | if ( false === $auth_version || intval( $auth_version ) < $update_if_older_than ) { |
| 46 | 46 | // Copy single site user lists to new options (if they exist). |
| 47 | 47 | $auth_settings = get_option( 'auth_settings' ); |
| 48 | 48 | if ( is_array( $auth_settings ) && array_key_exists( 'access_users_pending', $auth_settings ) ) { |
| 49 | - update_option( 'auth_settings_access_users_pending', $auth_settings['access_users_pending'], false ); | |
| 49 | + update_option( 'auth_settings_access_users_pending', $auth_settings['access_users_pending'] ); | |
| 50 | 50 | unset( $auth_settings['access_users_pending'] ); |
| 51 | - update_option( 'auth_settings', $auth_settings, true ); | |
| 51 | + update_option( 'auth_settings', $auth_settings ); | |
| 52 | 52 | } |
| 53 | 53 | if ( is_array( $auth_settings ) && array_key_exists( 'access_users_approved', $auth_settings ) ) { |
| 54 | - update_option( 'auth_settings_access_users_approved', $auth_settings['access_users_approved'], false ); | |
| 54 | + update_option( 'auth_settings_access_users_approved', $auth_settings['access_users_approved'] ); | |
| 55 | 55 | unset( $auth_settings['access_users_approved'] ); |
| 56 | - update_option( 'auth_settings', $auth_settings, true ); | |
| 56 | + update_option( 'auth_settings', $auth_settings ); | |
| 57 | 57 | } |
| 58 | 58 | if ( is_array( $auth_settings ) && array_key_exists( 'access_users_blocked', $auth_settings ) ) { |
| 59 | - update_option( 'auth_settings_access_users_blocked', $auth_settings['access_users_blocked'], false ); | |
| 59 | + update_option( 'auth_settings_access_users_blocked', $auth_settings['access_users_blocked'] ); | |
| 60 | 60 | unset( $auth_settings['access_users_blocked'] ); |
| 61 | - update_option( 'auth_settings', $auth_settings, true ); | |
| 61 | + update_option( 'auth_settings', $auth_settings ); | |
| 62 | 62 | } |
| 63 | 63 | // Copy multisite user lists to new options (if they exist). |
| 64 | 64 | if ( is_multisite() ) { |
| 65 | 65 | $auth_multisite_settings = get_blog_option( get_main_site_id( get_main_network_id() ), 'auth_multisite_settings', array() ); |
| @@ -133,9 +133,9 @@ | ||
| 133 | 133 | $auth_settings = get_option( 'auth_settings', array() ); |
| 134 | 134 | if ( array_key_exists( 'ldap_password', $auth_settings ) && strlen( $auth_settings['ldap_password'] ) > 0 ) { |
| 135 | 135 | $plaintext_ldap_password = Helper::decrypt( $auth_settings['ldap_password'], 'mcrypt' ); |
| 136 | 136 | $auth_settings['ldap_password'] = Helper::encrypt( $plaintext_ldap_password ); |
| 137 | - update_option( 'auth_settings', $auth_settings, true ); | |
| 137 | + update_option( 'auth_settings', $auth_settings ); | |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | // Update version to reflect this change has been made. |
| 141 | 141 | $auth_version = $update_if_older_than; |
| @@ -221,9 +221,9 @@ | ||
| 221 | 221 | $distinct_emails[] = $user['email']; |
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | if ( $should_update ) { |
| 225 | - update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved, false ); | |
| 225 | + update_option( 'auth_settings_access_users_approved', $auth_settings_access_users_approved ); | |
| 226 | 226 | } |
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | // Update version to reflect this change has been made. |
| @@ -437,9 +437,9 @@ | ||
| 437 | 437 | } else { |
| 438 | 438 | $auth_settings = get_option( 'auth_settings', array() ); |
| 439 | 439 | if ( array_key_exists( 'ldap_test_pass', $auth_settings ) && strlen( $auth_settings['ldap_test_pass'] ) > 0 ) { |
| 440 | 440 | unset( $auth_settings['ldap_test_pass'] ); |
| 441 | - update_option( 'auth_settings', $auth_settings, true ); | |
| 441 | + update_option( 'auth_settings', $auth_settings ); | |
| 442 | 442 | } |
| 443 | 443 | } |
| 444 | 444 | // Update version to reflect this change has been made. |
| 445 | 445 | $auth_version = $update_if_older_than; |
| @@ -549,9 +549,9 @@ | ||
| 549 | 549 | if ( $needs_updating ) { |
| 550 | 550 | if ( is_multisite() ) { |
| 551 | 551 | update_blog_option( get_main_site_id( get_main_network_id() ), 'auth_version', $auth_version ); |
| 552 | 552 | } else { |
| 553 | - update_option( 'auth_version', $auth_version, true ); | |
| 553 | + update_option( 'auth_version', $auth_version ); | |
| 554 | 554 | } |
| 555 | 555 | } |
| 556 | 556 | } |
| 557 | 557 | } |
