Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: bugfix

Modules: Auto-activate default modules that do not require a connection on unconnected sites, including Forms.
13 changes: 7 additions & 6 deletions projects/plugins/jetpack/class.jetpack.php
Original file line number Diff line number Diff line change
Expand Up @@ -2754,9 +2754,7 @@ public static function plugin_initialize() {
Jetpack_Options::update_options( compact( 'version', 'old_version' ) );
}

if ( self::is_connection_ready() ) {
self::handle_default_module_activation( true );
}
self::handle_default_module_activation( true );

self::load_modules();

Expand All @@ -2773,7 +2771,8 @@ public static function plugin_initialize() {
* require a user connection activated.
*/
private static function handle_default_module_activation( $should_activate_user_modules ) {
$active_modules = Jetpack_Options::get_option( 'active_modules' );
$connection_ready = self::is_connection_ready();
$active_modules = Jetpack_Options::get_option( 'active_modules' );
if ( $active_modules ) {
self::delete_active_modules();

Expand All @@ -2797,11 +2796,13 @@ private static function handle_default_module_activation( $should_activate_user_
$active_modules,
false
);
} elseif ( $should_activate_user_modules && ( new Connection_Manager() )->get_connection_owner_id() ) { // Check for a user connection.
} elseif ( $connection_ready && $should_activate_user_modules && ( new Connection_Manager() )->get_connection_owner_id() ) { // Check for a user connection.
self::activate_default_modules( false, false, array(), false, null, null, null );
Jetpack_Options::update_option( 'active_modules_initialized', true );
} else {
} elseif ( $connection_ready ) {
self::activate_default_modules( false, false, array(), false, null, null, false );
} else {
self::activate_default_modules( false, false, array(), false, null, false, false );
}
}

Expand Down
Loading