diff --git src/wp-admin/includes/ajax-actions.php src/wp-admin/includes/ajax-actions.php
index b6bd757..8a41c12 100644
|
|
function wp_ajax_install_plugin() { |
3613 | 3613 | } |
3614 | 3614 | |
3615 | 3615 | $install_status = install_plugin_install_status( $api ); |
| 3616 | $pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : ''; |
| 3617 | |
| 3618 | // If install request is coming from import page, do not return network activation link. |
| 3619 | $plugins_url = ( 'import' === $pagenow ) ? admin_url( 'plugins.php' ) : network_admin_url( 'plugins.php' ); |
3616 | 3620 | |
3617 | 3621 | if ( current_user_can( 'activate_plugins' ) && is_plugin_inactive( $install_status['file'] ) ) { |
3618 | 3622 | $status['activateUrl'] = add_query_arg( array( |
3619 | 3623 | '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $install_status['file'] ), |
3620 | 3624 | 'action' => 'activate', |
3621 | 3625 | 'plugin' => $install_status['file'], |
3622 | | ), network_admin_url( 'plugins.php' ) ); |
| 3626 | ), $plugins_url ); |
3623 | 3627 | } |
3624 | 3628 | |
3625 | | if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { |
| 3629 | if ( is_multisite() && current_user_can( 'manage_network_plugins' ) && 'import' !== $pagenow ) { |
3626 | 3630 | $status['activateUrl'] = add_query_arg( array( 'networkwide' => 1 ), $status['activateUrl'] ); |
3627 | 3631 | } |
3628 | 3632 | |
diff --git src/wp-admin/js/updates.js src/wp-admin/js/updates.js
index 239829f..3331816 100644
|
|
|
1876 | 1876 | |
1877 | 1877 | wp.updates.installPlugin( { |
1878 | 1878 | slug: $button.data( 'slug' ), |
| 1879 | pagenow: pagenow, |
1879 | 1880 | success: wp.updates.installImporterSuccess, |
1880 | 1881 | error: wp.updates.installImporterError |
1881 | 1882 | } ); |