<!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][9478] trunk: Make sure Site admins can set the "register" and "activate" pages in the pages association settings screen even if signups are not allowed</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/9478">9478</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/9478","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-12 19:00:06 +0000 (Thu, 12 Feb 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'>Make sure Site admins can set the "register" and "activate" pages in the pages association settings screen even if signups are not allowed
In 2.2, when signups are not allowed, it is not possible to associate a WordPress page to the register or the activate specific components. It introduced some confusion for some site admins and had an impact on plugins allowing users to invite others.
We will keep on working on the best way to deal with these directory pages in the next release. In the meantime, we are bringing back the possibility to always set the association for the register and the activate specific components.
props boonebgorges
See <a href="http://buddypress.trac.wordpress.org/ticket/6176">#6176</a>
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6197">#6197</a> (trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesadminfunctionsphp">trunk/tests/phpunit/testcases/admin/functions.php</a></li>
<li><a href="#trunktestsphpunittestcasescorefunctionsphp">trunk/tests/phpunit/testcases/core/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></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-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2015-02-12 15:27:00 UTC (rev 9477)
+++ trunk/src/bp-core/bp-core-functions.php 2015-02-12 19:00:06 UTC (rev 9478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +432,7 @@
</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"> // 'register' and 'activate' do not have components, but should be whitelisted.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( bp_get_signup_allowed() && ( 'register' === $component_name || 'activate' === $component_name ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'register' === $component_name || 'activate' === $component_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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="trunktestsphpunittestcasesadminfunctionsphp"></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/admin/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/admin/functions.php 2015-02-12 15:27:00 UTC (rev 9477)
+++ trunk/tests/phpunit/testcases/admin/functions.php 2015-02-12 19:00:06 UTC (rev 9478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,4 +120,67 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> buddypress()->active_components = $ac;
</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_core_activation_notice
+ */
+ public function test_bp_core_activation_notice_register_activate_pages_notcreated_signup_allowed() {
+ $bp = buddypress();
+ $reset_bp_pages = $bp->pages;
+ $reset_admin_notices = $bp->admin->notices;
+
+ // Reset pages
+ $bp->pages = bp_core_get_directory_pages();
+
+ add_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ bp_core_activation_notice();
+
+ remove_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $missing_pages = array();
+ foreach( buddypress()->admin->notices as $notice ) {
+ preg_match_all( '/<strong>(.+?)<\/strong>/', $notice['message'], $missing_pages );
+ }
+
+ $this->assertContains( 'Register', $missing_pages[1] );
+ $this->assertContains( 'Activate', $missing_pages[1] );
+
+ // Reset buddypress() vars
+ $bp->pages = $reset_bp_pages;
+ $bp->admin->notices = $reset_admin_notices;
+ }
+
+ /**
+ * @group bp_core_activation_notice
+ */
+ public function test_bp_core_activation_notice_register_activate_pages_created_signup_allowed() {
+ $bp = buddypress();
+ $reset_bp_pages = $bp->pages;
+ $reset_admin_notices = $bp->admin->notices;
+
+ add_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $ac = buddypress()->active_components;
+ bp_core_add_page_mappings( array_keys( $ac ) );
+
+ // Reset pages
+ $bp->pages = bp_core_get_directory_pages();
+
+ bp_core_activation_notice();
+
+ remove_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $missing_pages = array();
+ foreach( buddypress()->admin->notices as $notice ) {
+ preg_match_all( '/<strong>(.+?)<\/strong>/', $notice['message'], $missing_pages );
+ }
+
+ $this->assertNotContains( 'Register', $missing_pages[1] );
+ $this->assertNotContains( 'Activate', $missing_pages[1] );
+
+ // Reset buddypress() vars
+ $bp->pages = $reset_bp_pages;
+ $bp->admin->notices = $reset_admin_notices;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorefunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/functions.php 2015-02-12 15:27:00 UTC (rev 9477)
+++ trunk/tests/phpunit/testcases/core/functions.php 2015-02-12 19:00:06 UTC (rev 9478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,7 +567,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_page_mappings( array_keys( $ac ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'bp_get_signup_allowed', '__return_true', 999 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get page ids
+ $page_ids = bp_core_get_directory_page_ids();
+
+ // Need to delete these pages as previously created.
+ wp_delete_post( $page_ids['register'], true );
+ wp_delete_post( $page_ids['activate'], true );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_get_signup_allowed', '__return_false', 999 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_core_add_page_mappings( array_keys( $ac ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_ids = bp_core_get_directory_page_ids();
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'bp_get_signup_allowed', '__return_false', 999 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,6 +588,93 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @group bp_core_get_directory_pages
</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_bp_core_get_directory_pages_register_activate_page_created_signups_allowed() {
+ add_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $ac = buddypress()->active_components;
+ bp_core_add_page_mappings( array_keys( $ac ) );
+ $directory_pages = bp_core_get_directory_pages();
+
+ remove_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $this->assertTrue( isset( $directory_pages->register ) );
+ $this->assertTrue( isset( $directory_pages->activate ) );
+
+ $r = get_post( $directory_pages->register->id );
+ $this->assertTrue( 'publish' == $r->post_status );
+
+ $a = get_post( $directory_pages->activate->id );
+ $this->assertTrue( 'publish' == $a->post_status );
+ }
+
+ /**
+ * @group bp_core_get_directory_pages
+ */
+ public function test_bp_core_get_directory_pages_register_activate_page_notcreated_signups_allowed() {
+ add_filter( 'bp_get_signup_allowed', '__return_false', 999 );
+
+ $ac = buddypress()->active_components;
+ bp_core_add_page_mappings( array_keys( $ac ) );
+
+ remove_filter( 'bp_get_signup_allowed', '__return_false', 999 );
+
+ add_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $directory_pages = bp_core_get_directory_pages();
+
+ remove_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $this->assertFalse( isset( $directory_pages->register ) );
+ $this->assertFalse( isset( $directory_pages->activate ) );
+ }
+
+ /**
+ * @group bp_core_get_directory_pages
+ */
+ public function test_bp_core_get_directory_pages_register_activate_page_created_signups_notallowed() {
+ add_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ $ac = buddypress()->active_components;
+ bp_core_add_page_mappings( array_keys( $ac ) );
+
+ remove_filter( 'bp_get_signup_allowed', '__return_true', 999 );
+
+ add_filter( 'bp_get_signup_allowed', '__return_false', 999 );
+
+ $directory_pages = bp_core_get_directory_pages();
+
+ remove_filter( 'bp_get_signup_allowed', '__return_false', 999 );
+
+ $this->assertTrue( isset( $directory_pages->register ) );
+ $this->assertTrue( isset( $directory_pages->activate ) );
+
+ $r = get_post( $directory_pages->register->id );
+ $this->assertTrue( 'publish' == $r->post_status );
+
+ $a = get_post( $directory_pages->activate->id );
+ $this->assertTrue( 'publish' == $a->post_status );
+ }
+
+ /**
+ * @group bp_core_get_directory_pages
+ */
+ public function test_bp_core_get_directory_pages_register_activate_page_notcreated_signups_notallowed() {
+
+ add_filter( 'bp_get_signup_allowed', '__return_false', 999 );
+
+ $ac = buddypress()->active_components;
+ bp_core_add_page_mappings( array_keys( $ac ) );
+ $directory_pages = bp_core_get_directory_pages();
+
+ remove_filter( 'bp_get_signup_allowed', '__return_false', 999 );
+
+ $this->assertFalse( isset( $directory_pages->register ) );
+ $this->assertFalse( isset( $directory_pages->activate ) );
+ }
+
+ /**
+ * @group bp_core_get_directory_pages
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_core_get_directory_pages_pages_settings_update() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the cache
</span><span class="cx" style="display: block; padding: 0 10px"> $pages = bp_core_get_directory_pages();
</span></span></pre>
</div>
</div>
</body>
</html>