Changeset 16976

Timestamp:

12/16/2010 03:09:06 AM (14 years ago)

Author:

PeteMall

Message:

Use net admin plugin-install in site admin tools. Fixes #15839

File:

• trunk/wp-admin/import.php (modified) (3 diffs)

trunk/wp-admin/import.php

@@ -45 +45 @@
 require_once ('admin-header.php');
 $parent_file = 'tools.php';
+$href = is_multisite() ? network_admin_url( 'plugin-install.php' ) : admin_url( 'plugin-install.php' );
 ?>
 
@@ -109 +110 @@
             }
             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 {
@@ -131 +132 @@
 
 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>';
 ?>