<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16994] trunk: Make network_admin_url() return admin_url()
when not multisite like its home and site counterparts.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16994">16994</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-16 09:31:42 +0000 (Thu, 16 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/15840">#15840</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimportphp">trunk/wp-admin/import.php</a></li>
<li><a href="#trunkwpadminincludesupdatephp">trunk/wp-admin/includes/update.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import.php (16993 => 16994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import.php 2010-12-16 09:24:22 UTC (rev 16993)
+++ trunk/wp-admin/import.php 2010-12-16 09:31:42 UTC (rev 16994)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( empty($action) )
</span><del>- $action = '<a href="' . esc_url( maybe_network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
</del><ins>+ $action = '<a href="' . esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
</ins><span class="cx"> '&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox" title="' .
</span><span class="cx"> esc_attr__('Install importer') . '">' . $data[0] . '</a>';
</span><span class="cx"> } else {
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( current_user_can('install_plugins') )
</span><del>- 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>';
</del><ins>+ 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>';
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update.php (16993 => 16994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update.php 2010-12-16 09:24:22 UTC (rev 16993)
+++ trunk/wp-admin/includes/update.php 2010-12-16 09:31:42 UTC (rev 16994)
</span><span class="lines">@@ -100,11 +100,11 @@
</span><span class="cx">
</span><span class="cx"> switch ( $cur->response ) {
</span><span class="cx"> case 'development' :
</span><del>- 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' ) );
</del><ins>+ 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' ) );
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'upgrade' :
</span><del>- return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', maybe_network_admin_url( 'update-core.php' ), $cur->current);
</del><ins>+ return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', network_admin_url( 'update-core.php' ), $cur->current);
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'latest' :
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( current_user_can('update_core') ) {
</span><del>- $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' ) );
</del><ins>+ $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' ) );
</ins><span class="cx"> } else {
</span><span class="cx"> $msg = sprintf( __('<a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
</span><span class="cx"> }
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
</span><span class="cx">
</span><span class="cx"> if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
</span><del>- $msg .= " <a href='" . maybe_network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
</del><ins>+ $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo "<span id='wp-version-message'>$msg</span>";
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (16993 => 16994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-12-16 09:24:22 UTC (rev 16993)
+++ trunk/wp-includes/admin-bar.php 2010-12-16 09:31:42 UTC (rev 16994)
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> $update_title .= sprintf( __('Updates %s'), "<span id='ab-updates' class='update-count'>" . number_format_i18n($update_count) . '</span>' );
</span><span class="cx"> $update_title .= '</span>';
</span><span class="cx">
</span><del>- $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => maybe_network_admin_url( 'update-core.php' ) ) );
</del><ins>+ $wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => network_admin_url( 'update-core.php' ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (16993 => 16994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-12-16 09:24:22 UTC (rev 16993)
+++ trunk/wp-includes/link-template.php 2010-12-16 09:31:42 UTC (rev 16994)
</span><span class="lines">@@ -2223,6 +2223,9 @@
</span><span class="cx"> * @return string Admin url link with optional path appended
</span><span class="cx"> */
</span><span class="cx"> function network_admin_url( $path = '', $scheme = 'admin' ) {
</span><ins>+ if ( ! is_multisite() )
+ return admin_url( $path, $scheme );
+
</ins><span class="cx"> $url = network_site_url('wp-admin/network/', $scheme);
</span><span class="cx">
</span><span class="cx"> if ( !empty($path) && is_string($path) && strpos($path, '..') === false )
</span><span class="lines">@@ -2270,23 +2273,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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 );
-}
-
-/**
</del><span class="cx"> * Get the URL to the user's dashboard.
</span><span class="cx"> *
</span><span class="cx"> * If a user does not belong to any sites, the global user dashboard is used. If the user belongs to the current site,
</span></span></pre>
</div>
</div>
</body>
</html>