Ticket #54400: 54400.diff

src/wp-admin/plugins.php

@@ -724 +724 @@
 </h1>
 
 <?php
-if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_plugins' ) ) {
+if ( current_user_can( 'install_plugins' ) ) {
+        $install_url = is_multisite() ? network_admin_url( 'plugin-install.php' ) : admin_url( 'plugin-install.php' );
         ?>
-        <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
+        <a href="<?php echo esc_url( $install_url ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
         <?php
 }
 

src/wp-admin/themes.php

@@ -250 +250 @@
                 <span class="title-count theme-count"><?php echo ! empty( $_GET['search'] ) ? __( '&hellip;' ) : count( $themes ); ?></span>
         </h1>
 
-        <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
-                <a href="<?php echo esc_url( admin_url( 'theme-install.php' ) ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'theme' ); ?></a>
+        <?php if ( current_user_can( 'install_themes' ) ) :
+                $install_url = is_multisite() ? network_admin_url( 'theme-install.php' ) : admin_url( 'theme-install.php' );
+                ?>
+                <a href="<?php echo esc_url( $install_url ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'theme' ); ?></a>
         <?php endif; ?>
 
         <form class="search-form"></form>