<!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" />
<title>[21152] trunk/wp-includes/capabilities.php: Remove 'fall through' points in map_meta_cap() as they can hide bugs.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21152">21152</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-27 19:27:54 +0000 (Wed, 27 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove 'fall through' points in map_meta_cap() as they can hide bugs.</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 (21151 => 21152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2012-06-26 21:54:32 UTC (rev 21151)
+++ trunk/wp-includes/capabilities.php 2012-06-27 19:27:54 UTC (rev 21152)
</span><span class="lines">@@ -947,16 +947,16 @@
</span><span class="cx"> $caps[] = 'promote_users';
</span><span class="cx"> break;
</span><span class="cx"> case 'edit_user':
</span><ins>+ case 'edit_users':
</ins><span class="cx"> // Allow user to edit itself
</span><del>- if ( isset( $args[0] ) && $user_id == $args[0] )
</del><ins>+ if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
</ins><span class="cx"> break;
</span><del>- // Fall through
- case 'edit_users':
</del><ins>+
</ins><span class="cx"> // If multisite these caps are allowed only for super admins.
</span><span class="cx"> if ( is_multisite() && !is_super_admin( $user_id ) )
</span><span class="cx"> $caps[] = 'do_not_allow';
</span><span class="cx"> else
</span><del>- $caps[] = 'edit_users'; // Explicit due to primitive fall through
</del><ins>+ $caps[] = 'edit_users'; // edit_user maps to edit_users.
</ins><span class="cx"> break;
</span><span class="cx"> case 'delete_post':
</span><span class="cx"> case 'delete_page':
</span><span class="lines">@@ -1130,17 +1130,24 @@
</span><span class="cx"> // Disallow unfiltered_html for all users, even admins and super admins.
</span><span class="cx"> if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
</span><span class="cx"> $caps[] = 'do_not_allow';
</span><ins>+ elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+ $caps[] = 'do_not_allow';
</ins><span class="cx"> else
</span><span class="cx"> $caps[] = $cap;
</span><span class="cx"> break;
</span><span class="cx"> case 'edit_files':
</span><span class="cx"> case 'edit_plugins':
</span><span class="cx"> case 'edit_themes':
</span><del>- if ( defined('DISALLOW_FILE_EDIT') && DISALLOW_FILE_EDIT ) {
</del><ins>+ // Disallow the file editors.
+ if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
</ins><span class="cx"> $caps[] = 'do_not_allow';
</span><del>- break;
- }
- // Fall through if not DISALLOW_FILE_EDIT.
</del><ins>+ elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+ $caps[] = 'do_not_allow';
+ elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+ $caps[] = 'do_not_allow';
+ else
+ $caps[] = $cap;
+ break;
</ins><span class="cx"> case 'update_plugins':
</span><span class="cx"> case 'delete_plugins':
</span><span class="cx"> case 'install_plugins':
</span><span class="lines">@@ -1148,23 +1155,22 @@
</span><span class="cx"> case 'delete_themes':
</span><span class="cx"> case 'install_themes':
</span><span class="cx"> case 'update_core':
</span><del>- // Disallow anything that creates, deletes, or edits core, plugin, or theme files.
</del><ins>+ // Disallow anything that creates, deletes, or updates core, plugin, or theme files.
</ins><span class="cx"> // Files in uploads are excepted.
</span><del>- if ( defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS ) {
</del><ins>+ if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
</ins><span class="cx"> $caps[] = 'do_not_allow';
</span><del>- break;
- }
- // Fall through if not DISALLOW_FILE_MODS.
</del><ins>+ elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+ $caps[] = 'do_not_allow';
+ else
+ $caps[] = $cap;
+ break;
</ins><span class="cx"> case 'delete_user':
</span><span class="cx"> case 'delete_users':
</span><del>- // If multisite these caps are allowed only for super admins.
- if ( is_multisite() && !is_super_admin( $user_id ) ) {
</del><ins>+ // If multisite only super admins can delete users.
+ if ( is_multisite() && ! is_super_admin( $user_id ) )
</ins><span class="cx"> $caps[] = 'do_not_allow';
</span><del>- } else {
- if ( 'delete_user' == $cap )
- $cap = 'delete_users';
- $caps[] = $cap;
- }
</del><ins>+ else
+ $caps[] = 'delete_users'; // delete_user maps to delete_users.
</ins><span class="cx"> break;
</span><span class="cx"> case 'create_users':
</span><span class="cx"> if ( !is_multisite() )
</span></span></pre>
</div>
</div>
</body>
</html>