<!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>[17511] branches/3.1/wp-admin:
Anchor network and user admins at the network domain and path rather than at the main site
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17511">17511</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-03-08 22:56:43 +0000 (Tue, 08 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Anchor network and user admins at the network domain and path rather than at the main site. Makes the redirects consistent with network_admin_url(). fixes <a href="http://trac.wordpress.org/ticket/16652">#16652</a> for 3.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpadminnetworkadminphp">branches/3.1/wp-admin/network/admin.php</a></li>
<li><a href="#branches31wpadminuseradminphp">branches/3.1/wp-admin/user/admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpadminnetworkadminphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/network/admin.php (17510 => 17511)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/network/admin.php 2011-03-08 22:56:12 UTC (rev 17510)
+++ branches/3.1/wp-admin/network/admin.php 2011-03-08 22:56:43 UTC (rev 17511)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><del>-if ( ! is_main_site() ) {
</del><ins>+if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
</ins><span class="cx"> wp_redirect( network_admin_url() );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches31wpadminuseradminphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/user/admin.php (17510 => 17511)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/user/admin.php 2011-03-08 22:56:12 UTC (rev 17510)
+++ branches/3.1/wp-admin/user/admin.php 2011-03-08 22:56:43 UTC (rev 17511)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( ! is_main_site() ) {
</del><ins>+if ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) ) {
</ins><span class="cx"> wp_redirect( user_admin_url() );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>