@@ -14303,15 +14303,15 @@ private function get_parent_and_addons_installs_info() {
1430314303 $this->get_parent_instance() :
1430414304 $this;
1430514305
14306- $installed_addons_ids = array();
14306+ $installed_addons_ids_map = array();
1430714307
1430814308 $installed_addons_instances = $fs->get_installed_addons();
1430914309 foreach ( $installed_addons_instances as $instance ) {
14310- $installed_addons_ids [] = $instance->get_id();
14310+ $installed_addons_ids_map [] = $instance->get_id();
1431114311 }
1431214312
1431314313 $addons_ids = array_unique( array_merge(
14314- $installed_addons_ids ,
14314+ $installed_addons_ids_map ,
1431514315 $fs->get_updated_account_addons()
1431614316 ) );
1431714317
@@ -14358,7 +14358,8 @@ function _network_activate_ajax_action() {
1435814358 $this :
1435914359 $this->get_addon_instance( $plugin_id );
1436014360
14361- $error = false;
14361+ $error = false;
14362+ $next_page = '';
1436214363
1436314364 $sites = fs_request_get( 'sites', array(), 'post' );
1436414365 if ( is_array( $sites ) && ! empty( $sites ) ) {
@@ -14374,10 +14375,7 @@ function _network_activate_ajax_action() {
1437414375
1437514376 $total_sites = count( $sites );
1437614377 $total_sites_to_delegate = count( $sites_by_action['delegate'] );
14377-
14378- $next_page = '';
14379-
14380- $has_any_install = fs_request_get_bool( 'has_any_install' );
14378+ $has_any_install = fs_request_get_bool( 'has_any_install' );
1438114379
1438214380 if ( $total_sites === $total_sites_to_delegate &&
1438314381 ! $this->is_network_upgrade_mode() &&
0 commit comments