Changeset 5366 for trunk/bp-members/bp-members-template.php

Timestamp:

11/24/2011 04:37:47 AM (15 years ago)

Author:

boonebgorges

Message:

Deprecates bp_has_custom_activation_page() in favor of checking bp_pages for an activation page. Retools bp_get_activation_page() so that it returns the proper network registration page when adding users from a non-root Dashboard. Fixes #2350

File:

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

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

@@ -978 +978 @@
         }
 
-function bp_has_custom_activation_page() {
-        if ( locate_template( array( 'activate.php' ), false ) || locate_template( array( '/registration/activate.php' ), false ) )
-                return true;
-
-        return false;
-}
-
 function bp_activation_page() {
         echo bp_get_activation_page();
@@ -991 +984 @@
                 global $bp;
 
-                if ( bp_has_custom_activation_page() )
+                // Check the global directly to make sure the WP page exists in $bp->pages
+                if ( !empty( $bp->pages->activate->slug ) )
                         $page = trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug );
                 else