Ticket #31183: 31183.2.diff

src/wp-admin/menu.php

@@ -192 +192 @@
 
         if ( ! is_multisite() ) {
                 /* translators: add new plugin */
-                $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
-                $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
+                $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'update_plugins', 'plugin-install.php' );
+                $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'update_plugins', 'plugin-editor.php' );
         }
 
 unset( $update_data );

src/wp-admin/plugin-install.php

@@ -14 +14 @@
  */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('install_plugins') )
-        wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
+if ( ! ( isset( $_GET['tab'] ) && $_GET['tab'] == 'plugin-information' ) ) {
+        if ( ! current_user_can('install_plugins') )
+                wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
+}
 
 if ( is_multisite() && ! is_network_admin() ) {
         wp_redirect( network_admin_url( 'plugin-install.php' ) );