Changeset 38704 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

10/03/2016 06:41:37 AM (8 years ago)

Author:

swissspidy

Message:

Import: Fix plugin activation link after installing an importer on multisite.

When installing the importer via Ajax, the activation link should be the same as if the page were reloaded.

Props joelcj91 for initial patch.
Fixes #37943.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3620 +3620 @@
 
     $install_status = install_plugin_install_status( $api );
+    $pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
+
+    // If install request is coming from import page, do not return network activation link.
+    $plugins_url = ( 'import' === $pagenow ) ? admin_url( 'plugins.php' ) : network_admin_url( 'plugins.php' );
 
     if ( current_user_can( 'activate_plugins' ) && is_plugin_inactive( $install_status['file'] ) ) {
@@ -3626 +3630 @@
             'action'   => 'activate',
             'plugin'   => $install_status['file'],
-        ), network_admin_url( 'plugins.php' ) );
-    }
-
-    if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
+        ), $plugins_url );
+    }
+
+    if ( is_multisite() && current_user_can( 'manage_network_plugins' ) && 'import' !== $pagenow ) {
         $status['activateUrl'] = add_query_arg( array( 'networkwide' => 1 ), $status['activateUrl'] );
     }