| @@ 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 ) { |
|
| @@ 7264-7270 (lines=7) @@ | ||
| 7261 | ? array( 'sso' ) |
|
| 7262 | : array(); |
|
| 7263 | ||
| 7264 | if ( $active_modules = Jetpack_Options::get_option( 'active_modules' ) ) { |
|
| 7265 | Jetpack::delete_active_modules(); |
|
| 7266 | ||
| 7267 | Jetpack::activate_default_modules( 999, 1, array_merge( $active_modules, $other_modules ), $redirect_on_activation_error, false ); |
|
| 7268 | } else { |
|
| 7269 | Jetpack::activate_default_modules( false, false, $other_modules, $redirect_on_activation_error, false ); |
|
| 7270 | } |
|
| 7271 | ||
| 7272 | // Since this is a fresh connection, be sure to clear out IDC options |
|
| 7273 | Jetpack_IDC::clear_all_idc_options(); |
|