<!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>[14032] trunk: User is_super_admin().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14032">14032</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-07 15:28:10 +0000 (Wed, 07 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>User is_super_admin(). Props ocean90. fixes <a href="http://trac.wordpress.org/ticket/12888">#12888</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (14031 => 14032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2010-04-07 15:25:48 UTC (rev 14031)
+++ trunk/wp-admin/includes/user.php 2010-04-07 15:28:10 UTC (rev 14032)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> $potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
</span><span class="cx"> // Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
</span><span class="cx"> // Multisite super admins can freely edit their blog roles -- they possess all caps.
</span><del>- if ( ( is_multisite() && is_site_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
</del><ins>+ if ( ( is_multisite() && is_super_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
</ins><span class="cx"> $user->role = $new_role;
</span><span class="cx">
</span><span class="cx"> // If the new role isn't editable by the logged-in user die with error
</span></span></pre></div>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (14031 => 14032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2010-04-07 15:25:48 UTC (rev 14031)
+++ trunk/wp-includes/ms-deprecated.php 2010-04-07 15:28:10 UTC (rev 14032)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> * @deprecated Use $GLOBALS['current_user']->ID
</span><span class="cx"> */
</span><span class="cx"> function get_current_user_id() {
</span><del>- _deprecated_function( __FUNCTION__, '3.0', '$GLOBALS\'current_user\']->ID' );
</del><ins>+ _deprecated_function( __FUNCTION__, '3.0', '$GLOBALS[\'current_user\']->ID' );
</ins><span class="cx"> return $GLOBALS['current_user']->ID;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>