Ticket #27869: 27869.patch

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

@@ -2217 +2217 @@
                 wp_send_json_error();
         }
 
-        $args = wp_parse_args( wp_unslash( $_REQUEST['request'] ), array(
+        $request = wp_unslash( $_REQUEST['request'] );
+        $is_network = $request['is_network'];
+        unset( $request['is_network'] );
+
+        $args = wp_parse_args( $request, array(
                 'per_page' => 20,
                 'fields'   => $theme_field_defaults
         ) );
@@ -2233 +2237 @@
                 wp_send_json_error();
         }
 
-        $update_php = self_admin_url( 'update.php?action=install-theme' );
+        $update_php = $is_network ? network_admin_url( 'update.php?action=install-theme' ) : admin_url( 'update.php?action=install-theme' );
         foreach ( $api->themes as &$theme ) {
                 $theme->install_url = add_query_arg( array(
                         'theme'    => $theme->slug,

src/wp-admin/js/theme.js

@@ -318 +318 @@
                         data: {
                         // Request data
                                 request: _.extend({
+                                        is_network: themes.data.settings.isNetwork,
                                         per_page: 100,
                                         fields: {
                                                 description: true,

src/wp-admin/theme-install.php

@@ -46 +46 @@
                 'isInstall'     => true,
                 'canInstall'    => current_user_can( 'install_themes' ),
                 'installURI'    => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
-                'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH )
+                'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH ),
+                'isNetwork'     => is_network_admin()
         ),
         'l10n' => array(
                 'addNew' => __( 'Add New Theme' ),