@@ -14284,15 +14284,15 @@ private function get_parent_and_addons_installs_info() {
1428414284 $this->get_parent_instance() :
1428514285 $this;
1428614286
14287- $installed_addons_ids = array();
14287+ $installed_addons_ids_map = array();
1428814288
1428914289 $installed_addons_instances = $fs->get_installed_addons();
1429014290 foreach ( $installed_addons_instances as $instance ) {
14291- $installed_addons_ids [] = $instance->get_id();
14291+ $installed_addons_ids_map [] = $instance->get_id();
1429214292 }
1429314293
1429414294 $addons_ids = array_unique( array_merge(
14295- $installed_addons_ids ,
14295+ $installed_addons_ids_map ,
1429614296 $fs->get_updated_account_addons()
1429714297 ) );
1429814298
@@ -14339,7 +14339,8 @@ function _network_activate_ajax_action() {
1433914339 $this :
1434014340 $this->get_addon_instance( $plugin_id );
1434114341
14342- $error = false;
14342+ $error = false;
14343+ $next_page = '';
1434314344
1434414345 $sites = fs_request_get( 'sites', array(), 'post' );
1434514346 if ( is_array( $sites ) && ! empty( $sites ) ) {
@@ -14355,10 +14356,7 @@ function _network_activate_ajax_action() {
1435514356
1435614357 $total_sites = count( $sites );
1435714358 $total_sites_to_delegate = count( $sites_by_action['delegate'] );
14358-
14359- $next_page = '';
14360-
14361- $has_any_install = fs_request_get_bool( 'has_any_install' );
14359+ $has_any_install = fs_request_get_bool( 'has_any_install' );
1436214360
1436314361 if ( $total_sites === $total_sites_to_delegate &&
1436414362 ! $this->is_network_upgrade_mode() &&
0 commit comments