<!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>[15480] trunk/wp-includes: Ensure we'
re checking when looking for is_super_admin() in map_meta_cap().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15480">15480</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-07-29 21:58:58 +0000 (Thu, 29 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure we're checking when looking for is_super_admin() in map_meta_cap(). Bump DB version.
fixes <a href="http://trac.wordpress.org/ticket/14454">#14454</a> for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.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 (15479 => 15480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2010-07-29 21:57:26 UTC (rev 15479)
+++ trunk/wp-includes/capabilities.php 2010-07-29 21:58:58 UTC (rev 15480)
</span><span class="lines">@@ -812,7 +812,7 @@
</span><span class="cx"> // Fall through
</span><span class="cx"> case 'edit_users':
</span><span class="cx"> // If multisite these caps are allowed only for super admins.
</span><del>- if ( is_multisite() && !is_super_admin() )
</del><ins>+ if ( is_multisite() && !is_super_admin( $user_id ) )
</ins><span class="cx"> $caps[] = 'do_not_allow';
</span><span class="cx"> else
</span><span class="cx"> $caps[] = 'edit_users'; // Explicit due to primitive fall through
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> $caps[] = 'read_private_pages';
</span><span class="cx"> break;
</span><span class="cx"> case 'unfiltered_upload':
</span><del>- if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin() ) )
</del><ins>+ if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) ) )
</ins><span class="cx"> $caps[] = $cap;
</span><span class="cx"> else
</span><span class="cx"> $caps[] = 'do_not_allow';
</span><span class="lines">@@ -1028,7 +1028,7 @@
</span><span class="cx"> case 'delete_user':
</span><span class="cx"> case 'delete_users':
</span><span class="cx"> // If multisite these caps are allowed only for super admins.
</span><del>- if ( is_multisite() && !is_super_admin() )
</del><ins>+ if ( is_multisite() && !is_super_admin( $user_id ) )
</ins><span class="cx"> $caps[] = 'do_not_allow';
</span><span class="cx"> else
</span><span class="cx"> $caps[] = $cap;
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (15479 => 15480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2010-07-29 21:57:26 UTC (rev 15479)
+++ trunk/wp-includes/version.php 2010-07-29 21:58:58 UTC (rev 15480)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 15260;
</del><ins>+$wp_db_version = 15477;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>