Changeset 16994 for trunk/wp-admin/import.php

Timestamp:

12/16/2010 09:31:42 AM (14 years ago)

Author:

nacin

Message:

Make network_admin_url() return admin_url() when not multisite like its home and site counterparts. Kill the now redundant maybe_network_admin_url() function. fixes #15840.

File:

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

trunk/wp-admin/import.php

@@ -109 +109 @@
             }
             if ( empty($action) )
-                $action = '<a href="' . esc_url( maybe_network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
+                $action = '<a href="' . esc_url( network_admin_url( 'plugin-install.php?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>';
@@ -131 +131 @@
 
 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( maybe_network_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( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
 ?>