<!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][10376] branches/2.4: Caps: Fix issue with passing an empty array as an argument in `bp_current_user_can()`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10376">10376</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10376","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-25 19:23:55 +0000 (Wed, 25 Nov 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Caps: Fix issue with passing an empty array as an argument in `bp_current_user_can()`.
Changes to `bp_current_user_can()` in <a href="http://buddypress.trac.wordpress.org/ticket/6501">#6501</a> broke older capability checks
relying on an empty argument to be passed in order to use a fallback value.
Most notably, `bp_current_user_can('bp_xprofile_change_field_visibility' )`
checks now passed by default. This resulted in the "Change" link to
always be visible when editing a profile field even if an admin has enabled
"Enforce field visibility" for that particular field.
This commit fixes this issue by passing a `null` value if there are no
extra arguments to pass in `bp_current_user_can()`. Commit also includes
a unit test.
See <a href="http://buddypress.trac.wordpress.org/ticket/6730">#6730</a> (2.4-branch).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches24srcbpcorebpcorecapsphp">branches/2.4/src/bp-core/bp-core-caps.php</a></li>
<li><a href="#branches24testsphpunittestcasescorecapsphp">branches/2.4/tests/phpunit/testcases/core/caps.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches24srcbpcorebpcorecapsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.4/src/bp-core/bp-core-caps.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.4/src/bp-core/bp-core-caps.php 2015-11-23 05:51:55 UTC (rev 10375)
+++ branches/2.4/src/bp-core/bp-core-caps.php 2015-11-25 19:23:55 UTC (rev 10376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,6 +291,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $args['blog_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Backward compatibility for older bp_current_user_can() checks
+ if ( empty( $args ) ) {
+ $args = null;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Use root blog if no ID passed
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $blog_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = bp_get_root_blog_id();
</span></span></pre></div>
<a id="branches24testsphpunittestcasescorecapsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.4/tests/phpunit/testcases/core/caps.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.4/tests/phpunit/testcases/core/caps.php 2015-11-23 05:51:55 UTC (rev 10375)
+++ branches/2.4/tests/phpunit/testcases/core/caps.php 2015-11-25 19:23:55 UTC (rev 10376)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $cant );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @group bp_xprofile_change_field_visibility
+ */
+ public function test_bp_current_user_can_should_pass_null_in_args_parameter_if_empty() {
+ $u = $this->factory->user->create();
+ $this->set_current_user( $u );
+
+ /**
+ * Fake bp_get_the_profile_field_id() to pretend we're in the field loop and
+ * to avoid notices when checking 'bp_xprofile_change_field_visibility' cap
+ */
+ $GLOBALS['field'] = new stdClass;
+ $GLOBALS['field']->id = 1;
+
+ // Capture the cap's $args
+ add_filter( 'bp_xprofile_map_meta_caps', array( $this, 'check_cap_args' ), 10, 4 );
+
+ // Use a cap check that depends on a null value for a cap's args
+ bp_current_user_can( 'bp_xprofile_change_field_visibility' );
+
+ // Assert!
+ $this->assertEquals( null, $this->test_args[0] );
+
+ // Reset
+ remove_filter( 'bp_xprofile_map_meta_caps', array( $this, 'check_cap_args' ), 10, 4 );
+ unset( $GLOBALS['field'], $this->test_args );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function grant_cap_foo( $allcaps, $caps ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_root_blog() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $allcaps['foo'] = 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,4 +81,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $allcaps;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function check_cap_args( $caps, $cap, $user_id, $args ) {
+ $this->test_args = $args;
+ return $caps;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>