@@ -14283,15 +14283,15 @@ private function get_parent_and_addons_installs_info() {
1428314283 $this->get_parent_instance() :
1428414284 $this;
1428514285
14286- $installed_addons_ids = array();
14286+ $installed_addons_ids_map = array();
1428714287
1428814288 $installed_addons_instances = $fs->get_installed_addons();
1428914289 foreach ( $installed_addons_instances as $instance ) {
14290- $installed_addons_ids [] = $instance->get_id();
14290+ $installed_addons_ids_map [] = $instance->get_id();
1429114291 }
1429214292
1429314293 $addons_ids = array_unique( array_merge(
14294- $installed_addons_ids ,
14294+ $installed_addons_ids_map ,
1429514295 $fs->get_updated_account_addons()
1429614296 ) );
1429714297
@@ -14338,7 +14338,8 @@ function _network_activate_ajax_action() {
1433814338 $this :
1433914339 $this->get_addon_instance( $plugin_id );
1434014340
14341- $error = false;
14341+ $error = false;
14342+ $next_page = '';
1434214343
1434314344 $sites = fs_request_get( 'sites', array(), 'post' );
1434414345 if ( is_array( $sites ) && ! empty( $sites ) ) {
@@ -14354,10 +14355,7 @@ function _network_activate_ajax_action() {
1435414355
1435514356 $total_sites = count( $sites );
1435614357 $total_sites_to_delegate = count( $sites_by_action['delegate'] );
14357-
14358- $next_page = '';
14359-
14360- $has_any_install = fs_request_get_bool( 'has_any_install' );
14358+ $has_any_install = fs_request_get_bool( 'has_any_install' );
1436114359
1436214360 if ( $total_sites === $total_sites_to_delegate &&
1436314361 ! $this->is_network_upgrade_mode() &&
0 commit comments