| @@ 244-249 (lines=6) @@ | ||
| 241 | ? array( 'sso' ) |
|
| 242 | : array(); |
|
| 243 | ||
| 244 | if ( $active_modules = Jetpack_Options::get_option( 'active_modules' ) ) { |
|
| 245 | Jetpack::delete_active_modules(); |
|
| 246 | Jetpack::activate_default_modules( 999, 1, array_merge( $active_modules, $other_modules ), false ); |
|
| 247 | } else { |
|
| 248 | Jetpack::activate_default_modules( false, false, $other_modules, false ); |
|
| 249 | } |
|
| 250 | } |
|
| 251 | ||
| 252 | private static function verify_token( $access_token ) { |
|
| @@ 7235-7241 (lines=7) @@ | ||
| 7232 | ? array( 'sso' ) |
|
| 7233 | : array(); |
|
| 7234 | ||
| 7235 | if ( $active_modules = Jetpack_Options::get_option( 'active_modules' ) ) { |
|
| 7236 | Jetpack::delete_active_modules(); |
|
| 7237 | ||
| 7238 | Jetpack::activate_default_modules( 999, 1, array_merge( $active_modules, $other_modules ), $redirect_on_activation_error, false ); |
|
| 7239 | } else { |
|
| 7240 | Jetpack::activate_default_modules( false, false, $other_modules, $redirect_on_activation_error, false ); |
|
| 7241 | } |
|
| 7242 | ||
| 7243 | // Since this is a fresh connection, be sure to clear out IDC options |
|
| 7244 | Jetpack_IDC::clear_all_idc_options(); |
|