<!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>[17332] trunk: Correct user admin redirection checks,
and deny access to the user admin when not running multisite.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17332">17332</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-01-20 03:04:20 +0000 (Thu, 20 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct user admin redirection checks, and deny access to the user admin when not running multisite. fixes <a href="http://trac.wordpress.org/ticket/16297">#16297</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminuseradminphp">trunk/wp-admin/user/admin.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminuseradminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user/admin.php (17331 => 17332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user/admin.php 2011-01-19 19:56:54 UTC (rev 17331)
+++ trunk/wp-admin/user/admin.php 2011-01-20 03:04:20 UTC (rev 17332)
</span><span class="lines">@@ -11,6 +11,11 @@
</span><span class="cx">
</span><span class="cx"> require_once( dirname(dirname(__FILE__)) . '/admin.php');
</span><span class="cx">
</span><ins>+if ( ! is_multisite() ) {
+ wp_redirect( admin_url() );
+ exit;
+}
+
</ins><span class="cx"> if ( ! is_main_site() ) {
</span><span class="cx"> wp_redirect( user_admin_url() );
</span><span class="cx"> exit;
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (17331 => 17332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2011-01-19 19:56:54 UTC (rev 17331)
+++ trunk/wp-login.php 2011-01-20 03:04:20 UTC (rev 17332)
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
</span><span class="cx"> if ( is_multisite() && !get_active_blog_for_user($user->id) )
</span><span class="cx"> $redirect_to = user_admin_url();
</span><del>- elseif ( !is_multisite() && !$user->has_cap('read') )
</del><ins>+ elseif ( is_multisite() && !$user->has_cap('read') )
</ins><span class="cx"> $redirect_to = user_admin_url();
</span><span class="cx"> elseif ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) )
</span><span class="cx"> $redirect_to = admin_url('profile.php');
</span></span></pre>
</div>
</div>
</body>
</html>