From 9fbd8c032e4a49db06ce43d322000fbe747200c1 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 14 Dec 2010 16:46:45 +0000
Subject: [PATCH] Hide add new button or link to network/plugin-install on
 plugins page. Props ocean90. fixes #15785

git-svn-id: http://svn.automattic.com/wordpress/trunk@16919 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/plugins.php | 5 ++++-
 wp-admin/themes.php  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index baefa78ba..992554e87 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -360,7 +360,10 @@ if ( !empty($invalid) )
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); if ( current_user_can('install_plugins') ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2>
+<h2><?php echo esc_html( $title );
+if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
+<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
+<?php } ?></h2>
 
 <?php do_action( 'pre_current_active_plugins', $plugins['all'] ) ?>
 
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index b319b5c04..78332b109 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -83,7 +83,7 @@ if ( !is_multisite() ) : ?>
 	<?php endif;
 else : ?>
 <h2>
-<?php esc_html_e( $title ); ?>
+<?php echo esc_html( $title ); ?>
 <?php endif; ?>
 </h2>