@@ 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 ) { |
@@ 7223-7229 (lines=7) @@ | ||
7220 | ? array( 'sso' ) |
|
7221 | : array(); |
|
7222 | ||
7223 | if ( $active_modules = Jetpack_Options::get_option( 'active_modules' ) ) { |
|
7224 | Jetpack::delete_active_modules(); |
|
7225 | ||
7226 | Jetpack::activate_default_modules( 999, 1, array_merge( $active_modules, $other_modules ), $redirect_on_activation_error, false ); |
|
7227 | } else { |
|
7228 | Jetpack::activate_default_modules( false, false, $other_modules, $redirect_on_activation_error, false ); |
|
7229 | } |
|
7230 | ||
7231 | // Since this is a fresh connection, be sure to clear out IDC options |
|
7232 | Jetpack_IDC::clear_all_idc_options(); |