<!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>[14040] trunk/wp-admin/includes/ms.php: Revert [14011].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14040">14040</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-08 04:15:58 +0000 (Thu, 08 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/14011">[14011]</a>. Add some actions. fixes <a href="http://trac.wordpress.org/ticket/12109">#12109</a>, see <a href="http://trac.wordpress.org/ticket/12460">#12460</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.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 (14039 => 14040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-04-08 03:36:52 UTC (rev 14039)
+++ trunk/wp-admin/includes/ms.php 2010-04-08 04:15:58 UTC (rev 14040)
</span><span class="lines">@@ -809,17 +809,15 @@
</span><span class="cx"> * @param $user_id
</span><span class="cx"> */
</span><span class="cx"> function grant_super_admin( $user_id ) {
</span><del>- global $current_user;
</del><ins>+ do_action( 'grant_super_admin', $user_id );
</ins><span class="cx">
</span><del>- if ( $current_user->ID == $user_id || !current_user_can( 'manage_network_options' ) )
- return;
-
</del><span class="cx"> $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
</span><span class="cx">
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx"> if ( ! in_array( $user->user_login, $super_admins ) ) {
</span><span class="cx"> $super_admins[] = $user->user_login;
</span><span class="cx"> update_site_option( 'site_admins' , $super_admins );
</span><ins>+ do_action( 'granted_super_admin', $user_id );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -830,22 +828,16 @@
</span><span class="cx"> * @param $user_id
</span><span class="cx"> */
</span><span class="cx"> function revoke_super_admin( $user_id ) {
</span><del>- global $current_user;
</del><ins>+ do_action( 'revoke_super_admin', $user_id );
</ins><span class="cx">
</span><del>- if ( $current_user->ID == $user_id || !current_user_can( 'manage_network_options' ) )
- return;
-
- $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
- if ( count( $super_admins ) < 2 )
- return;
-
</del><span class="cx"> $admin_email = get_site_option( 'admin_email' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $user = new WP_User( $user_id );
</span><del>- if ( $user->ID != $current_user->ID || $user->user_email != $admin_email ) {
</del><ins>+ if ( $user->user_email != $admin_email ) {
</ins><span class="cx"> foreach ( $super_admins as $key => $username ) {
</span><span class="cx"> if ( $username == $user->user_login ) {
</span><span class="cx"> unset( $super_admins[$key] );
</span><ins>+ do_action( 'revoked_super_admin', $user_id );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>