<!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>[13270] trunk/wp-includes/capabilities.php:
use map_meta_cap for multisite superadmins, props dd32, fixes #12109</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13270">13270</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-21 00:19:05 +0000 (Sun, 21 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>use map_meta_cap for multisite superadmins, props dd32, fixes <a href="http://trac.wordpress.org/ticket/12109">#12109</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.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 (13269 => 13270)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-02-21 00:10:20 UTC (rev 13269)
+++ trunk/wp-includes/capabilities.php 2010-02-21 00:19:05 UTC (rev 13270)
</span><span class="lines">@@ -722,13 +722,17 @@
</span><span class="cx"> $cap = $this->translate_level_to_cap( $cap );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Multisite super admin has all caps by definition.
- if ( is_multisite() && is_super_admin() )
- return true;
-
</del><span class="cx"> $args = array_slice( func_get_args(), 1 );
</span><span class="cx"> $args = array_merge( array( $cap, $this->ID ), $args );
</span><span class="cx"> $caps = call_user_func_array( 'map_meta_cap', $args );
</span><ins>+
+ // Multisite super admin has all caps by definition, Unless specifically denied.
+ if ( is_multisite() && is_super_admin() ) {
+ if ( in_array('do_not_allow', $caps) )
+ return false;
+ return true;
+ }
+
</ins><span class="cx"> // Must have ALL requested caps
</span><span class="cx"> $capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args );
</span><span class="cx"> foreach ( (array) $caps as $cap ) {
</span><span class="lines">@@ -1027,9 +1031,6 @@
</span><span class="cx"> function current_user_can( $capability ) {
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="cx">
</span><del>- if ( is_multisite() && is_super_admin() )
- return true;
-
</del><span class="cx"> if ( empty( $current_user ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>