Changeset 16994 for trunk/wp-includes/link-template.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-includes/link-template.php (modified) (2 diffs)

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 );
 }