<!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>[12611] trunk/wp-includes: Introduce is_super_admin().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12611">12611</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-06 23:27:22 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce is_super_admin(). see <a href="http://trac.wordpress.org/ticket/11644">#11644</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (12610 => 12611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-01-06 22:22:45 UTC (rev 12610)
+++ trunk/wp-includes/capabilities.php 2010-01-06 23:27:22 UTC (rev 12611)
</span><span class="lines">@@ -1062,4 +1062,33 @@
</span><span class="cx"> return $wp_roles->remove_role( $role );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Determine if user is a site admin.
+ *
+ * @since 3.0
+ *
+ * @param int $user_id (Optional) The ID of a user. Defaults to the current user.
+ * @return bool True if the user is a site admin.
+ */
+function is_super_admin( $user_id = false ) {
+ global $current_user;
+
+ if ( !$current_user && !$user_id )
+ return false;
+
+ if ( !$user_id )
+ $user_id = $current_user->id;
+
+ if ( !$user_id )
+ return false;
+
+ $user = new WP_User($user_id);
+
+ $site_admins = get_site_option( 'site_admins', array('admin') );
+ if ( is_array( $site_admins ) && in_array( $user->user_login, $site_admins ) )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12610 => 12611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-06 22:22:45 UTC (rev 12610)
+++ trunk/wp-includes/ms-functions.php 2010-01-06 23:27:22 UTC (rev 12611)
</span><span class="lines">@@ -183,25 +183,28 @@
</span><span class="cx"> return $current_user->ID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function is_site_admin( $user_login = false ) {
- global $current_user;
</del><ins>+/**
+ * Determine if user is a site admin.
+ *
+ * @deprecated Use {@link is_keymaster()}
+ *
+ */
+function is_site_admin( $user_login = '' ) {
+ // This function must reside in a file included only if is_multsite() since many plugins
+ // test for its existence to determine if multisite is enabled.
</ins><span class="cx">
</span><del>- if ( !$current_user && !$user_login )
- return false;
-
- if ( $user_login ) {
- $user_login = sanitize_user( $user_login );
- } elseif( isset( $current_user->user_login ) ) {
- $user_login = $current_user->user_login;
</del><ins>+ if ( empty($user_login) ) {
+ $user_id = get_current_user_id();
+ if ( !$user_id )
+ return false;
</ins><span class="cx"> } else {
</span><del>- return false;
</del><ins>+ $user = new WP_User(null, $user_login);
+ if ( empty($user->id) )
+ return false;
+ $user_id = $user->id;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $site_admins = get_site_option( 'site_admins', array('admin') );
- if( is_array( $site_admins ) && in_array( $user_login, $site_admins ) )
- return true;
-
- return false;
</del><ins>+ return is_super_admin($user_id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>