<!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>[14043] trunk/wp-admin: More grant/revoke super admin improvements.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14043">14043</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-09 08:26:16 +0000 (Fri, 09 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More grant/revoke super admin improvements. fixes <a href="http://trac.wordpress.org/ticket/12933">#12933</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (14042 => 14043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-04-09 07:17:42 UTC (rev 14042)
+++ trunk/wp-admin/includes/ms.php 2010-04-09 08:26:16 UTC (rev 14043)
</span><span class="lines">@@ -818,7 +818,9 @@
</span><span class="cx"> $super_admins[] = $user->user_login;
</span><span class="cx"> update_site_option( 'site_admins' , $super_admins );
</span><span class="cx"> do_action( 'granted_super_admin', $user_id );
</span><ins>+ return true;
</ins><span class="cx"> }
</span><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -830,19 +832,16 @@
</span><span class="cx"> function revoke_super_admin( $user_id ) {
</span><span class="cx"> do_action( 'revoke_super_admin', $user_id );
</span><span class="cx">
</span><del>- $admin_email = get_site_option( 'admin_email' );
</del><span class="cx"> $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
</span><del>-
</del><span class="cx"> $user = new WP_User( $user_id );
</span><del>- if ( $user->user_email != $admin_email ) {
- foreach ( $super_admins as $key => $username ) {
- if ( $username == $user->user_login ) {
- unset( $super_admins[$key] );
- update_site_option( 'site_admins' , $super_admins );
- do_action( 'revoked_super_admin', $user_id );
- break;
- }
</del><ins>+ if ( $user->user_email != get_site_option( 'admin_email' ) ) {
+ if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
+ unset( $super_admins[$key] );
+ update_site_option( 'site_admins', $super_admins );
+ do_action( 'revoked_super_admin', $user_id );
+ return true;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (14042 => 14043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-04-09 07:17:42 UTC (rev 14042)
+++ trunk/wp-admin/user-edit.php 2010-04-09 08:26:16 UTC (rev 14043)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> if ( $delete_role ) // stops users being added to current blog when they are edited
</span><span class="cx"> delete_user_meta( $user_id, $blog_prefix . 'capabilities' );
</span><span class="cx">
</span><del>- if ( is_multisite() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) )
</del><ins>+ if ( is_multisite() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) )
</ins><span class="cx"> empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>