<!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][11155] trunk: Members: Auto-create registration pages when user registration is enabled.</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/11155">11155</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/11155","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>2016-09-22 01:50:49 +0000 (Thu, 22 Sep 2016)</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'>Members: Auto-create registration pages when user registration is enabled.
Props r-a-y, boonebgorges.
See <a href="http://buddypress.trac.wordpress.org/ticket/7193">#7193</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersclassesclassbpmembersadminphp">trunk/src/bp-members/classes/class-bp-members-admin.php</a></li>
<li><a href="#trunktestsphpunittestcasescorefunctionsbpCoreGetDirectoryPageIdsphp">trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersclassesclassbpmembersadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-admin.php 2016-09-22 01:46:54 UTC (rev 11154)
+++ trunk/src/bp-members/classes/class-bp-members-admin.php 2016-09-22 01:50:49 UTC (rev 11155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,6 +214,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( "views_{$user_screen}", array( $this, 'signup_filter_view' ), 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'set-screen-option', array( $this, 'signup_screen_options' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Registration is turned on.
+ add_action( 'update_site_option_registration', array( $this, 'multisite_registration_on' ), 10, 2 );
+ add_action( 'update_option_users_can_register', array( $this, 'single_site_registration_on' ), 10, 2 );
</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"> /** Users List - Members Types ***************************************
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,6 +239,41 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Create registration pages when multisite user registration is turned on.
+ *
+ * @since 2.7.0
+ *
+ * @param string $option_name Current option name; value is always 'registration'.
+ * @param string $value
+ */
+ public function multisite_registration_on( $option_name, $value ) {
+ if ( 'user' === $value || 'all' === $value ) {
+ bp_core_add_page_mappings( array(
+ 'register' => 1,
+ 'activate' => 1
+ ) );
+ }
+ }
+
+ /**
+ * Create registration pages when single site registration is turned on.
+ *
+ * @since 2.7.0
+ *
+ * @param string $old_value
+ * @param string $value
+ */
+ public function single_site_registration_on( $old_value, $value ) {
+ // Single site.
+ if ( ! is_multisite() && ! empty( $value ) ) {
+ bp_core_add_page_mappings( array(
+ 'register' => 1,
+ 'activate' => 1
+ ) );
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get the user ID.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Look for $_GET['user_id']. If anything else, force the user ID to the
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorefunctionsbpCoreGetDirectoryPageIdsphp"></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/bpCoreGetDirectoryPageIds.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php 2016-09-22 01:46:54 UTC (rev 11154)
+++ trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php 2016-09-22 01:50:49 UTC (rev 11155)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,4 +285,58 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Now verify that our BP activity page was not wiped out
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $dir_pages->activity );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket BP7193
+ */
+ public function test_bp_core_get_directory_pages_autocreate_register_pages_single_site() {
+ if ( is_multisite() ) {
+ return;
+ }
+
+ // Emulate being in the admin area.
+ if ( ! class_exists( 'BP_Members_Admin', false ) ) {
+ require BP_PLUGIN_DIR . 'bp-members/classes/class-bp-members-admin.php';
+ }
+ $admin = new BP_Members_Admin;
+ add_action( 'update_option_users_can_register', array( $admin, 'single_site_registration_on' ), 10, 2 );
+
+ // Emulate turning registration on.
+ update_option( 'users_can_register', 1 );
+
+ // Now check directory pages.
+ $pages = bp_core_get_directory_pages();
+
+ $this->assertNotEmpty( $pages->register );
+ $this->assertNotEmpty( $pages->activate );
+
+ remove_action( 'update_option_users_can_register', array( $admin, 'single_site_registration_on' ), 10, 2 );
+ }
+
+ /**
+ * @ticket BP7193
+ */
+ public function test_bp_core_get_directory_pages_autocreate_register_pages_multisite() {
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ // Emulate being in the network admin area.
+ if ( ! class_exists( 'BP_Members_Admin', false ) ) {
+ require BP_PLUGIN_DIR . 'bp-members/classes/class-bp-members-admin.php';
+ }
+ $admin = new BP_Members_Admin;
+ add_action( 'update_site_option_registration', array( $admin, 'multisite_registration_on' ), 10, 2 );
+
+ // Emulate turning registration on.
+ update_site_option( 'registration', 'user' );
+
+ // Now check directory pages.
+ $pages = bp_core_get_directory_pages();
+
+ $this->assertNotEmpty( $pages->register );
+ $this->assertNotEmpty( $pages->activate );
+
+ remove_action( 'update_site_option_registration', array( $admin, 'multisite_registration_on' ), 10, 2 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>