<!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][13170] trunk/src: Membership Requests: Change labels on register page.</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 { white-space: pre-line; 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/13170">13170</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/13170","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>2021-12-10 16:15:05 +0000 (Fri, 10 Dec 2021)</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'>Membership Requests: Change labels on register page.
We are using the standard "register" form to collect
membership requests, so we need to change the labels
in many cases to avoid confusion. Also ensure that users
can access the registration page when membership
requests are enabled.
See <a href="http://buddypress.trac.wordpress.org/ticket/8582">#8582</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersmembershiprequestsphp">trunk/src/bp-members/bp-members-membership-requests.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpregistrationthemecompatphp">trunk/src/bp-members/classes/class-bp-registration-theme-compat.php</a></li>
<li><a href="#trunksrcbpmembersscreensregisterphp">trunk/src/bp-members/screens/register.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmembersregisterphp">trunk/src/bp-templates/bp-legacy/buddypress/members/register.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoretemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template.php 2021-12-10 16:14:51 UTC (rev 13169)
+++ trunk/src/bp-core/bp-core-template.php 2021-12-10 16:15:05 UTC (rev 13170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3192,7 +3192,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sign up page.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( bp_is_register_page() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp_title_parts = array( __( 'Create an Account', 'buddypress' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_get_membership_requests_required() ) {
+ $bp_title_parts = array( __( 'Request Membership', 'buddypress' ) );
+ } else {
+ $bp_title_parts = array( __( 'Create an Account', 'buddypress' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Activation page.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( bp_is_activation_page() ) {
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></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/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php 2021-12-10 16:14:51 UTC (rev 13169)
+++ trunk/src/bp-members/bp-members-functions.php 2021-12-10 16:15:05 UTC (rev 13170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2444,25 +2444,47 @@
</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"> // Unactivated user account found!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set up the feedback message.
- $signup_id = $signup['signups'][0]->signup_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Don't allow users to resend their own activation email
+ * when membership requests are enabled.
+ */
+ if ( bp_get_membership_requests_required() ) {
+ $error_message = sprintf(
+ '<strong>%1$s</strong> %2$s',
+ esc_html_x( 'Error:', 'Warning displayed on the WP Login screen', 'buddypress' ),
+ esc_html_x( 'Your membership request has not yet been approved.', 'Error message displayed on the WP Login screen', 'buddypress' )
+ );
+ } else {
+ // Set up the feedback message.
+ $signup_id = $signup['signups'][0]->signup_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $resend_url_params = array(
- 'action' => 'bp-resend-activation',
- 'id' => $signup_id,
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $resend_url_params = array(
+ 'action' => 'bp-resend-activation',
+ 'id' => $signup_id,
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $resend_url = wp_nonce_url(
- add_query_arg( $resend_url_params, wp_login_url() ),
- 'bp-resend-activation'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $resend_url = wp_nonce_url(
+ add_query_arg( $resend_url_params, wp_login_url() ),
+ 'bp-resend-activation'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $resend_string = '<br /><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error_message = sprintf(
+ '<strong>%1$s</strong> %2$s<br /><br />%3$s',
+ esc_html_x( 'Error:', 'Warning displayed on the WP Login screen', 'buddypress' ),
+ esc_html_x( 'Your account has not been activated. Check your email for the activation link.', 'Error message displayed on the WP Login screen', 'buddypress' ),
+ sprintf(
+ /* translators: %s: the link to resend the activation email. */
+ esc_html_x( 'If you have not received an email yet, %s.', 'WP Login screen message', 'buddypress' ),
+ sprintf(
+ '<a href="%1$s">%2$s</a>',
+ esc_url( $resend_url ),
+ esc_html_x( 'click here to resend it', 'Text of the link to resend the activation email', 'buddypress' )
+ )
+ )
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: the activation url */
- $resend_string .= sprintf( __( 'If you have not received an email yet, <a href="%s">click here to resend it</a>.', 'buddypress' ), esc_url( $resend_url ) );
-
- return new WP_Error( 'bp_account_not_activated', __( '<strong>Error</strong>: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) . $resend_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'bp_account_not_activated', $error_message );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 30, 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersmembershiprequestsphp"></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/bp-members-membership-requests.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-membership-requests.php 2021-12-10 16:14:51 UTC (rev 13169)
+++ trunk/src/bp-members/bp-members-membership-requests.php 2021-12-10 16:15:05 UTC (rev 13170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,6 +259,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_core_signup_after_delete', 'bp_members_membership_requests_delete_notifications_on_change' );
</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">+ * In the Nouveau template pack, when membership requests are required,
+ * change registration form submit button label to "Submit Request".
+ *
+ * @since 10.0.0
+ *
+ * @return string $retval the HTML for the request membership link.
+ */
+function bp_members_membership_requests_filter_complete_signup_button( $buttons ) {
+
+ $buttons['register']['attributes']['value'] = __( 'Submit Request', 'buddypress' );
+ return $buttons;
+}
+add_filter( 'bp_nouveau_get_submit_button', 'bp_members_membership_requests_filter_complete_signup_button' );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Administration: Change certain behavior and labels
</span><span class="cx" style="display: block; padding: 0 10px"> * on the WP Admin > Users > Manage Signups screen.
</span><span class="cx" style="display: block; padding: 0 10px"> *********************************************************************/
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpregistrationthemecompatphp"></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-registration-theme-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-registration-theme-compat.php 2021-12-10 16:14:51 UTC (rev 13169)
+++ trunk/src/bp-members/classes/class-bp-registration-theme-compat.php 2021-12-10 16:15:05 UTC (rev 13170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,10 +97,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function dummy_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Registration page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_register_page() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = __( 'Create an Account', 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_get_membership_requests_required() ) {
+ $title = __( 'Request Membership', 'buddypress' );
+ } else {
+ $title = __( 'Create an Account', 'buddypress' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'completed-confirmation' == bp_get_current_signup_step() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = __( 'Check Your Email To Activate Your Account!', 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_get_membership_requests_required() ) {
+ $title = __( 'Your Membership Request has been submitted.', 'buddypress' );
+ } else {
+ $title = __( 'Check Your Email To Activate Your Account!', 'buddypress' );
+ }
</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"> // Activation page.
</span></span></pre></div>
<a id="trunksrcbpmembersscreensregisterphp"></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/screens/register.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/screens/register.php 2021-12-10 16:14:51 UTC (rev 13169)
+++ trunk/src/bp-members/screens/register.php 2021-12-10 16:15:05 UTC (rev 13170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,9 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bp_get_signup_allowed() && ! $active_invite ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $requests_enabled = bp_get_membership_requests_required();
+
+ if ( ! bp_get_signup_allowed() && ! $active_invite && ! $requests_enabled ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $bp->signup->step = 'registration-disabled';
</span><span class="cx" style="display: block; padding: 0 10px"> // If the signup page is submitted, validate and save.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['signup_submit'] ) && bp_verify_nonce_request( 'bp_new_signup' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // No errors! Let's register those deets.
</span><span class="cx" style="display: block; padding: 0 10px"> $active_signup = bp_core_get_root_option( 'registration' );
</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 ( 'none' != $active_signup ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'none' != $active_signup || $requests_enabled ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the extended profiles module is enabled.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_active( 'xprofile' ) ) {
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressmembersregisterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/register.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/members/register.php 2021-12-10 16:14:51 UTC (rev 13169)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/register.php 2021-12-10 16:15:05 UTC (rev 13170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,10 +351,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'bp_before_registration_submit_buttons' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'bp_before_registration_submit_buttons' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_get_membership_requests_required() ) {
+ $button_text = __( 'Submit Request', 'buddypress' );
+ } else {
+ $button_text = __( 'Complete Sign Up', 'buddypress' );
+ }
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="submit" name="signup_submit" id="signup_submit" value="<?php esc_attr_e( 'Complete Sign Up', 'buddypress' ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="submit" name="signup_submit" id="signup_submit" value="<?php echo esc_attr( $button_text ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +397,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_before_registration_confirmed' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="template-notices" role="alert" aria-atomic="true">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( bp_registration_needs_activation() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( bp_get_membership_requests_required() ) : ?>
+ <p><?php _e( 'You have successfully submitted your membership request! Our site moderators will review your submission and send you an activation email if your request is approved.', 'buddypress' ); ?></p>
+ <?php elseif ( bp_registration_needs_activation() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You have successfully created your account! Please log in using the username and password you have just created.', 'buddypress' ); ?></p>
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/functions.php 2021-12-10 16:14:51 UTC (rev 13169)
+++ trunk/src/bp-templates/bp-nouveau/includes/functions.php 2021-12-10 16:15:05 UTC (rev 13170)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1122,7 +1122,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Adjust some messages to the context.
</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 ( 'completed-confirmation' === $feedback_id && bp_registration_needs_activation() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'completed-confirmation' === $feedback_id && bp_get_membership_requests_required() ) {
+ $feedback_messages['completed-confirmation']['message'] = __( 'You have successfully submitted your membership request! Our site moderators will review your submission and send you an activation email if your request is approved.', 'buddypress' );
+ } elseif ( 'completed-confirmation' === $feedback_id && bp_registration_needs_activation() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $feedback_messages['completed-confirmation']['message'] = __( 'You have successfully created your account! To begin using this site you will need to activate your account via the email we have just sent to your address.', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'member-notifications-none' === $feedback_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_myprofile = bp_is_my_profile();
</span></span></pre>
</div>
</div>
</body>
</html>