Changeset 11154

Timestamp:

09/22/2016 01:46:54 AM (10 years ago)

Author:

r-a-y

Message:

Members: Simplify bp_get_signup_allowed().

We only need to call bp_get_option( 'users_can_register' ) for both
single-site and multisite as multisite already filters the
'users_can_register' option:
​https://core.trac.wordpress.org/browser/tags/4.6.1/src/wp-includes/ms-default-filters.php#L20
​https://core.trac.wordpress.org/browser/tags/4.6.1/src/wp-includes/ms-functions.php#L2104

See #7193.

File:

• trunk/src/bp-members/bp-members-template.php (modified) (2 diffs)

trunk/src/bp-members/bp-members-template.php

@@ -2508 +2508 @@
          */
         function bp_get_signup_allowed() {
-                $bp = buddypress();
-
-                $signup_allowed = false;
-
-                if ( is_multisite() ) {
-                        $registration = bp_core_get_root_option( 'registration' );
-
-                        if ( in_array( $registration, array( 'all', 'user' ) ) ) {
-                                $signup_allowed = true;
-                        }
-
-                } else {
-                        if ( bp_get_option( 'users_can_register') ) {
-                                $signup_allowed = true;
-                        }
-                }
-
                 /**
                  * Filters whether or not new signups are allowed.
@@ -2532 +2515 @@
                  * @param bool $signup_allowed Whether or not new signups are allowed.
                  */
-                return apply_filters( 'bp_get_signup_allowed', $signup_allowed );
+                return apply_filters( 'bp_get_signup_allowed', (bool) bp_get_option( 'users_can_register' ) );
         }