Ticket #37943: 37943.2.patch
File 37943.2.patch, 1.9 KB (added by , 9 years ago) |
---|
-
src/wp-admin/js/updates.js
641 641 * @param {string} response.activateUrl URL to activate the just installed plugin. 642 642 */ 643 643 wp.updates.installImporterSuccess = function( response ) { 644 644 645 wp.updates.addAdminNotice( { 645 646 id: 'install-success', 646 647 className: 'notice-success is-dismissible', … … 1876 1877 1877 1878 wp.updates.installPlugin( { 1878 1879 slug: $button.data( 'slug' ), 1880 pagenow: pagenow, 1879 1881 success: wp.updates.installImporterSuccess, 1880 1882 error: wp.updates.installImporterError 1881 1883 } ); -
src/wp-admin/includes/ajax-actions.php
3612 3612 wp_send_json_error( $status ); 3613 3613 } 3614 3614 3615 $install_status = install_plugin_install_status( $api ); 3615 $install_status = install_plugin_install_status( $api ); 3616 $pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : ''; 3616 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' ); 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 3629 if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {