Changeset 13173

Timestamp:

12/10/2021 11:17:02 PM (22 months ago)

Author:

imath

Message:

Improve the callback used to output the membership request setting

• add missing buddypress text domain for l10n functions.
• make sure the specific multisite explanations about the feature are rightly located into this callback instead of the site invitations setting one.

See #8582

File:

• trunk/src/bp-core/admin/bp-core-admin-settings.php (modified) (2 diffs)

trunk/src/bp-core/admin/bp-core-admin-settings.php

@@ -193 +193 @@
     <label for="bp-enable-members-invitations"><?php _e( 'Allow registered members to invite people to join this network', 'buddypress' ); ?></label>
     <?php if ( ! bp_get_signup_allowed() ) : ?>
-        <?php if ( is_multisite() ) : ?>
-            <p class="description"><?php esc_html_e( 'With a WP multisite setup, to require membership requests for new signups, choose one of the following two options from the Network Settings > Registration Settings pane:' ); ?><p>
-                <ul>
-                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests but not allow site creation requests, select "Registration is disabled".' ) ?></p></li>
-                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests and to allow new sites to be created by your users, choose "Logged in users may register new sites".' ) ?></p></li>
-                </ul>
-            <p class="description"><?php esc_html_e( 'The other two options, "User accounts may be registered" and "Both sites and user accounts can be registered," are open in nature and membership requests will not be enabled if one of those options is selected.' ); ?><p>
-        <?php else : ?>
         <p class="description"><?php esc_html_e( 'Public registration is currently disabled. However, invitees will still be able to register if network invitations are enabled.', 'buddypress' ); ?></p>
-        <?php endif; ?>
     <?php endif; ?>
     <?php
@@ -223 +214 @@
     <label for="bp-enable-membership-requests"><?php esc_html_e( 'Allow visitors to request site membership. If enabled, an administrator must approve each new site membership request.', 'buddypress' ); ?></label>
     <?php if ( bp_get_signup_allowed() ) : ?>
-        <p class="description"><?php esc_html_e( 'Public registration is currently enabled. If you wish to require approval for new memberships, disable public registration and enable the membership requests feature.', 'buddypress' ); ?></p>
+        <?php if ( is_multisite() ) : ?>
+            <p class="description"><?php esc_html_e( 'With a WP multisite setup, to require membership requests for new signups, choose one of the following two options from the Network Settings > Registration Settings pane:', 'buddypress' ); ?><p>
+                <ul>
+                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests but not allow site creation requests, select "Registration is disabled".', 'buddypress' ) ?></p></li>
+                    <li><p class="description"><?php esc_html_e( 'To allow the submission of membership requests and to allow new sites to be created by your users, choose "Logged in users may register new sites".', 'buddypress' ) ?></p></li>
+                </ul>
+            <p class="description"><?php esc_html_e( 'The other two options, "User accounts may be registered" and "Both sites and user accounts can be registered," are open in nature and membership requests will not be enabled if one of those options is selected.', 'buddypress' ); ?><p>
+        <?php else : ?>
+            <p class="description"><?php esc_html_e( 'Public registration is currently enabled. If you wish to require approval for new memberships, disable public registration and enable the membership requests feature.', 'buddypress' ); ?></p>
+        <?php endif; ?>
     <?php endif; ?>
     <?php