| @@ 149-155 (lines=7) @@ | ||
| 146 | : array(); | |
| 147 | ||
| 148 | $redirect_on_activation_error = ( 'client' === $data['auth_type'] ) ? true : false; | |
| 149 | 		if ( $active_modules = Jetpack_Options::get_option( 'active_modules' ) ) { | |
| 150 | Jetpack::delete_active_modules(); | |
| 151 | ||
| 152 | Jetpack::activate_default_modules( 999, 1, array_merge( $active_modules, $other_modules ), $redirect_on_activation_error, false ); | |
| 153 | 		} else { | |
| 154 | Jetpack::activate_default_modules( false, false, $other_modules, $redirect_on_activation_error, false ); | |
| 155 | } | |
| 156 | ||
| 157 | // Since this is a fresh connection, be sure to clear out IDC options | |
| 158 | Jetpack_IDC::clear_all_idc_options(); | |
| @@ 1079-1084 (lines=6) @@ | ||
| 1076 | ? array( 'sso' ) | |
| 1077 | : array(); | |
| 1078 | ||
| 1079 | 			if ( $active_modules = Jetpack_Options::get_option( 'active_modules' ) ) { | |
| 1080 | Jetpack::delete_active_modules(); | |
| 1081 | Jetpack::activate_default_modules( 999, 1, array_merge( $active_modules, $other_modules ), false ); | |
| 1082 | 			} else { | |
| 1083 | Jetpack::activate_default_modules( false, false, $other_modules, false ); | |
| 1084 | } | |
| 1085 | } | |
| 1086 | ||
| 1087 | WP_CLI::log( json_encode( $body_json ) ); | |