<!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][10326] trunk: Allow access-protected bp_nav items to exist.</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/10326">10326</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/10326","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-06 00:39:46 +0000 (Fri, 06 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'>Allow access-protected bp_nav items to exist.
Fix error introduced in <a href="http://buddypress.trac.wordpress.org/changeset/10003">r10003</a> that prevents
access-protected nav items from being added to the
`bp_nav` array. The access protection should
happen at access time in
`bp_core_register_nav_screen_function()`.
See <a href="http://buddypress.trac.wordpress.org/ticket/6503">#6503</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorebuddybarphp">trunk/src/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunktestsphpunittestcasescorenavbpCoreNewNavItemphp">trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-buddybar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-buddybar.php 2015-11-04 10:23:27 UTC (rev 10325)
+++ trunk/src/bp-core/bp-core-buddybar.php 2015-11-06 00:39:46 UTC (rev 10326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Then, hook the screen function for the added nav item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_core_register_nav_screen_function( $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hooked = bp_core_register_nav_screen_function( $r );
+ if ( false === $hooked ){
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after adding an item to the main BuddyPress navigation array.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,15 +124,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * If this nav item is hidden for the displayed user, and
- * the logged in user is not the displayed user
- * looking at their own profile, don't create the nav item.
- */
- if ( empty( $r['show_for_displayed_user'] ) && ! bp_user_has_access() ) {
- return false;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['item_css_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['item_css_id'] = $r['slug'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -414,8 +408,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Then, hook the screen function for the added subnav item.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_core_register_subnav_screen_function( $args );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hooked = bp_core_register_subnav_screen_function( $args );
+ if ( false === $hooked ) {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorenavbpCoreNewNavItemphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php 2015-11-04 10:23:27 UTC (rev 10325)
+++ trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php 2015-11-06 00:39:46 UTC (rev 10326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,4 +124,70 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $retval );
</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">+ public function test_existence_of_access_protected_user_nav() {
+ $bp_nav = buddypress()->bp_nav;
+
+ $u = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+ $old_current_user = get_current_user_id();
+ $this->set_current_user( $u2 );
+
+ $this->go_to( bp_core_get_user_domain( $u ) );
+
+ $expected = array(
+ 'name' => 'Settings',
+ 'slug' => 'settings',
+ 'link' => trailingslashit( bp_loggedin_user_domain() . 'settings' ),
+ 'css_id' => 'settings',
+ 'show_for_displayed_user' => false,
+ 'position' => 100,
+ 'screen_function' => 'bp_settings_screen_general',
+ 'default_subnav_slug' => 'general'
+ );
+
+ $this->assertSame( buddypress()->bp_nav['settings'], $expected );
+
+ // Clean up
+ buddypress()->bp_nav = $bp_nav;
+ $this->set_current_user( $old_current_user );
+ }
+
+ public function test_creation_of_access_protected_user_nav() {
+ // The nav item must be added to bp_nav, even if the current user
+ // can't visit that nav item.
+ $bp_nav = buddypress()->bp_nav;
+
+ $u = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+ $old_current_user = get_current_user_id();
+ $this->set_current_user( $u2 );
+
+ $this->go_to( bp_core_get_user_domain( $u ) );
+
+ bp_core_new_nav_item( array(
+ 'name' => 'Woof',
+ 'slug' => 'woof',
+ 'show_for_displayed_user' => false,
+ 'position' => 35,
+ 'screen_function' => 'woof_screen_function',
+ 'default_subnav_slug' => 'woof-one'
+ ) );
+
+ $expected = array(
+ 'name' => 'Woof',
+ 'slug' => 'woof',
+ 'link' => trailingslashit( bp_loggedin_user_domain() . 'woof' ),
+ 'css_id' => 'woof',
+ 'show_for_displayed_user' => false,
+ 'position' => 35,
+ 'screen_function' => 'woof_screen_function',
+ 'default_subnav_slug' => 'woof-one'
+ );
+
+ $this->assertSame( buddypress()->bp_nav['woof'], $expected );
+
+ // Clean up
+ buddypress()->bp_nav = $bp_nav;
+ $this->set_current_user( $old_current_user );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>