@@ -13945,15 +13945,15 @@ private function get_parent_and_addons_installs_info() {
1394513945 $this->get_parent_instance() :
1394613946 $this;
1394713947
13948- $installed_addons_ids = array();
13948+ $installed_addons_ids_map = array();
1394913949
1395013950 $installed_addons_instances = $fs->get_installed_addons();
1395113951 foreach ( $installed_addons_instances as $instance ) {
13952- $installed_addons_ids [] = $instance->get_id();
13952+ $installed_addons_ids_map [] = $instance->get_id();
1395313953 }
1395413954
1395513955 $addons_ids = array_unique( array_merge(
13956- $installed_addons_ids ,
13956+ $installed_addons_ids_map ,
1395713957 $fs->get_updated_account_addons()
1395813958 ) );
1395913959
@@ -14000,7 +14000,8 @@ function _network_activate_ajax_action() {
1400014000 $this :
1400114001 $this->get_addon_instance( $plugin_id );
1400214002
14003- $error = false;
14003+ $error = false;
14004+ $next_page = '';
1400414005
1400514006 $sites = fs_request_get( 'sites', array(), 'post' );
1400614007 if ( is_array( $sites ) && ! empty( $sites ) ) {
@@ -14016,10 +14017,7 @@ function _network_activate_ajax_action() {
1401614017
1401714018 $total_sites = count( $sites );
1401814019 $total_sites_to_delegate = count( $sites_by_action['delegate'] );
14019-
14020- $next_page = '';
14021-
14022- $has_any_install = fs_request_get_bool( 'has_any_install' );
14020+ $has_any_install = fs_request_get_bool( 'has_any_install' );
1402314021
1402414022 if ( $total_sites === $total_sites_to_delegate &&
1402514023 ! $this->is_network_upgrade_mode() &&
0 commit comments