From ded61185489807971ca3564964baa09978d54046 Mon Sep 17 00:00:00 2001
From: PeteMall <PeteMall@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 16 Dec 2010 03:09:06 +0000
Subject: [PATCH] Use net admin plugin-install in site admin tools. Fixes
 #15839

git-svn-id: http://svn.automattic.com/wordpress/trunk@16976 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/import.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-admin/import.php b/wp-admin/import.php
index 0e1e325af..07616a82c 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -44,6 +44,7 @@ if ( ! empty( $_GET['invalid'] ) && !empty($popular_importers[$_GET['invalid']][
 add_thickbox();
 require_once ('admin-header.php');
 $parent_file = 'tools.php';
+$href = is_multisite() ? network_admin_url( 'plugin-install.php' ) : admin_url( 'plugin-install.php' );
 ?>
 
 <div class="wrap">
@@ -108,8 +109,8 @@ if (empty ($importers)) {
 				}
 			}
 			if ( empty($action) )
-				$action = '<a href="' . esc_url(admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
-										'&from=import&TB_iframe=true&width=600&height=550')) . '" class="thickbox" title="' .
+				$action = '<a href="' . esc_url( $href . '?tab=plugin-information&plugin=' . $plugin_slug .
+										'&from=import&TB_iframe=true&width=600&height=550' ) . '" class="thickbox" title="' .
 										esc_attr__('Install importer') . '">' . $data[0] . '</a>';
 		} else {
 			$action = "<a href='" . esc_url("admin.php?import=$id") . "' title='" . esc_attr( wptexturize(strip_tags($data[1])) ) ."'>{$data[0]}</a>";
@@ -130,7 +131,7 @@ if (empty ($importers)) {
 }
 
 if ( current_user_can('install_plugins') )
-	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.'), esc_url(admin_url('plugin-install.php?tab=search&type=tag&s=importer')) ) . '</p>';
+	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugins directory</a> to see if an importer is available.'), esc_url( $href . '?tab=search&type=tag&s=importer' ) ) . '</p>';
 ?>
 
 </div>