Changeset 4088 for trunk/bp-members/bp-members-signup.php

Timestamp:

03/08/2011 06:35:03 AM (14 years ago)

Author:

johnjamesjacoby

Message:

More auditing of _slug and _root_slug functions.

Introduce functions for updating '$bp->is_' globals to prevent loading $bp global in several functions.

Various phpDoc fixes and whitespace clean-up. (1.3 trunk)

File:

• trunk/bp-members/bp-members-signup.php (modified) (6 diffs)

trunk/bp-members/bp-members-signup.php

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Member Sign-up
+ *
+ * Functions and filters specific to the member sign-up process
+ *
+ * @package BuddyPress
+ * @subpackage Members
+ */
 
 
@@ -5 +14 @@
     global $bp, $wpdb;
 
-    if ( $bp->current_component != BP_REGISTER_SLUG )
-        return false;
-
-    $bp->is_directory = false;
+    if ( !bp_is_current_component( 'register' ) )
+        return false;
+
+    // Not a directory
+    bp_update_is_directory( false, 'register' );
 
     if ( bp_is_component_front_page( 'register' ) && ( is_user_logged_in() || !bp_get_signup_allowed() ) )
-        bp_core_redirect( bp_get_root_domain() . '/' . $bp->members->slug );
+        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
 
     // If the user is logged in, redirect away from here
@@ -155 +165 @@
     global $bp, $wpdb;
 
-    if ( BP_ACTIVATION_SLUG != $bp->current_component )
+    if ( bp_is_current_component( 'activate' ) )
         return false;
 
@@ -167 +177 @@
         if ( !empty( $user->errors ) ) {
             bp_core_add_message( $user->get_error_message(), 'error' );
-            bp_core_redirect( bp_get_root_domain() . '/' . BP_ACTIVATION_SLUG );
+            bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
         }
 
@@ -593 +603 @@
 // Kill the wp-signup.php if custom registration signup templates are present
 function bp_members_wpsignup_redirect() {
+    global $bp;
+
     $action = '';
     if ( isset( $_GET['action'] ) )
@@ -601 +613 @@
 
     if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
-        bp_core_redirect( bp_get_root_domain() . '/' . BP_REGISTER_SLUG . '/' );
+        bp_core_redirect( bp_get_root_domain() . '/' . $bp->pages->register->slug . '/' );
 }
 if ( is_multisite() )