<!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>[BuddyPress][6844] trunk/bp-core/bp-core-caps.php: Fix bug in _bp_enforce_bp_moderate_cap_for_admins() causing it not to appear when BuddyPress is activated on a single site in a network.</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://buddypress.trac.wordpress.org/changeset/6844">6844</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-03-09 20:43:38 +0000 (Sat, 09 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bug in _bp_enforce_bp_moderate_cap_for_admins() causing it not to appear when BuddyPress is activated on a single site in a network. Switch it to use 'map_meta_cap' instead. Add @access phpdoc tag.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecapsphp">trunk/bp-core/bp-core-caps.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecapsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-caps.php (6843 => 6844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-caps.php 2013-03-07 15:36:36 UTC (rev 6843)
+++ trunk/bp-core/bp-core-caps.php 2013-03-09 20:43:38 UTC (rev 6844)
</span><span class="lines">@@ -209,24 +209,31 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="cx"> * @see WP_User::has_cap()
</span><ins>+ * @access private
</ins><span class="cx"> *
</span><span class="cx"> * @param array $allcaps The caps that WP associates with the given role
</span><span class="cx"> * @param array $caps The caps being tested for in WP_User::has_cap()
</span><span class="cx"> * @param array $args Miscellaneous arguments passed to the user_has_cap filter
</span><span class="cx"> * @return array $allcaps The user's cap list, with 'bp_moderate' appended, if relevant
</span><span class="cx"> */
</span><del>-function _bp_enforce_bp_moderate_cap_for_admins( $allcaps, $caps, $args ) {
- if ( in_array( 'bp_moderate', $caps ) && // We only care if checking for bp_moderate
- !in_array( 'do_not_allow', $caps ) && // 'do_not_allow' overrides everything else
- !is_multisite() && // Check not necessary on Multisite
- isset( $allcaps['delete_users'] ) ) // Mimicking WP's check for Administrator status
- {
- $allcaps['bp_moderate'] = true;
- }
</del><ins>+function _bp_enforce_bp_moderate_cap_for_admins( $caps = array(), $cap = '', $user_id = 0, $args = array() ) {
</ins><span class="cx">
</span><del>- return $allcaps;
</del><ins>+ // Bail if not checking the 'bp_moderate' cap
+ if ( 'bp_moderate' !== $cap )
+ return $caps;
+
+ // Bail if BuddyPress is not network activated
+ if ( bp_is_network_activated() )
+ return $caps;
+
+ // Never trust inactive users
+ if ( bp_is_user_inactive( $user_id ) )
+ return $caps;
+
+ // Only users that can 'manage_options' on this site can 'bp_moderate'
+ return array( 'manage_options' );
</ins><span class="cx"> }
</span><del>-add_filter( 'user_has_cap', '_bp_enforce_bp_moderate_cap_for_admins', 10, 3 );
</del><ins>+add_filter( 'map_meta_cap', '_bp_enforce_bp_moderate_cap_for_admins', 10, 4 );
</ins><span class="cx">
</span><span class="cx"> /** Deprecated ****************************************************************/
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>