Changeset 16994

Timestamp:

12/16/2010 09:31:42 AM (16 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.

Location:

trunk

Files:

• wp-admin/import.php (modified) (2 diffs)
• wp-admin/includes/update.php (modified) (3 diffs)
• wp-includes/admin-bar.php (modified) (1 diff)
• wp-includes/link-template.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>';
 ?>
 

trunk/wp-admin/includes/update.php

@@ -101 +101 @@
         switch ( $cur->response ) {
         case 'development' :
-                return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], maybe_network_admin_url( 'update-core.php' ) );
+                return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) );
         break;
 
         case 'upgrade' :
-                return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', maybe_network_admin_url( 'update-core.php' ), $cur->current);
+                return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', network_admin_url( 'update-core.php' ), $cur->current);
         break;
 
@@ -131 +131 @@
 
         if ( current_user_can('update_core') ) {
-                $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, maybe_network_admin_url( 'update-core.php' ) );
+                $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, network_admin_url( 'update-core.php' ) );
         } else {
                 $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
@@ -149 +149 @@
 
         if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
-                $msg .= " <a href='" . maybe_network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
+                $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
         }
 

trunk/wp-includes/admin-bar.php

@@ -275 +275 @@
         $update_title .= '</span>';
 
-        $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => maybe_network_admin_url( 'update-core.php' ) ) );
+        $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => network_admin_url( 'update-core.php' ) ) );
 }
 

trunk/wp-includes/link-template.php

@@ -2224 +2224 @@
 */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
+        if ( ! is_multisite() )
+                return admin_url( $path, $scheme );
+
         $url = network_site_url('wp-admin/network/', $scheme);
 
@@ -2268 +2271 @@
         else
                 return admin_url($path, $scheme);
-}
-
-/**
- * Retrieve the url to the admin area for either the current blog or the network
- * depending on whether multisite is enabled.
- *
- * @since 3.1.0
- *
- * @param string $path Optional path relative to the admin url
- * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
- * @return string Admin url link with optional path appended
-*/
-function maybe_network_admin_url( $path = '', $scheme = 'admin' ) {
-        if ( is_multisite() )
-                return network_admin_url( $path, $scheme );
-        else
-                return admin_url( $path, $scheme );
 }