Changeset 2583

Timestamp:

02/04/2010 12:10:32 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1802

Location:

trunk

Files:

• bp-core/bp-core-signup.php (modified) (1 diff)
• bp-themes/bp-default/members/index.php (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (6 diffs)

trunk/bp-core/bp-core-signup.php

@@ -53 +53 @@
                 $bp->signup->email = $_POST['signup_email'];
 
-                /* Now we've checked account details, we can check profile information */
-                $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
-
-                /* Loop through the posted fields formatting any datebox values then validate the field */
-                foreach ( (array) $profile_field_ids as $field_id ) {
-                        if ( !isset( $_POST['field_' . $field_id] ) ) {
-                                if ( isset( $_POST['field_' . $field_id . '_day'] ) )
-                                        $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
-                        }
-
-                        if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
-                                $bp->signup->errors['field_' . $field_id] = __( 'This is a required field', 'buddypress' );
+                if ( !empty( $_POST['signup_profile_field_ids'] ) && function_exists( 'xprofile_check_is_required_field' ) ) {
+                        /* Now we've checked account details, we can check profile information */
+                        $profile_field_ids = explode( ',', $_POST['signup_profile_field_ids'] );
+
+                        /* Loop through the posted fields formatting any datebox values then validate the field */
+                        foreach ( (array) $profile_field_ids as $field_id ) {
+                                if ( !isset( $_POST['field_' . $field_id] ) ) {
+                                        if ( isset( $_POST['field_' . $field_id . '_day'] ) )
+                                                $_POST['field_' . $field_id] = strtotime( $_POST['field_' . $field_id . '_day'] . $_POST['field_' . $field_id . '_month'] . $_POST['field_' . $field_id . '_year'] );
+                                }
+
+                                if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
+                                        $bp->signup->errors['field_' . $field_id] = __( 'This is a required field', 'buddypress' );
+                        }
                 }
 

trunk/bp-themes/bp-default/members/index.php

@@ -30 +30 @@
                                                         <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
                                                         <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>
-                                                        <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
+
+                                                        <?php if ( bp_is_active( 'xprofile' ) ) : ?>
+                                                                <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
+                                                        <?php endif; ?>
 
                                                         <?php do_action( 'bp_members_directory_order_options' ) ?>

trunk/bp-themes/bp-default/registration/register.php

@@ -42 +42 @@
                                         <input type="password" name="signup_password_confirm" id="signup_password_confirm" value="" />
 
-                                </div>
+                                </div><!-- #basic-details-section -->
 
                                 <?php do_action( 'bp_after_account_details_fields' ) ?>
@@ -51 +51 @@
                                 <?php /***** Extra Profile Details ******/ ?>
 
+                                <?php if ( bp_is_active( 'xprofile' ) ) : ?>
                                 <div class="register-section" id="profile-details-section">
 
@@ -155 +156 @@
                                         <input type="hidden" name="signup_profile_field_ids" id="signup_profile_field_ids" value="<?php bp_the_profile_group_field_ids() ?>" />
 
-                                </div>
-
-                                <?php endwhile; endif; endif; ?>
+                                        <?php endwhile; endif; endif; ?>
+
+                                </div><!-- #profile-details-section -->
+                                <?php endif; ?>
 
                                 <?php do_action( 'bp_after_signup_profile_fields' ) ?>
@@ -196 +198 @@
                                                 </div>
 
-                                        </div>
+                                        </div><!-- #blog-details-section -->
 
                                         <?php do_action( 'bp_after_blog_details_fields' ) ?>
@@ -205 +207 @@
 
                                 <div class="submit">
-                                        <input type="submit" name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?> &rarr;" />
+                                        <input type="submit"name="signup_submit" id="signup_submit" value="<?php _e( 'Complete Sign Up', 'buddypress' ) ?> &rarr;" />
                                 </div>
 
@@ -226 +228 @@
                                 <?php endif; ?>
 
-                                <?php if ( !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?>
+                                <?php if ( bp_is_active( 'xprofile' ) && !(int)get_site_option( 'bp-disable-avatar-uploads' ) ) : ?>
 
                                         <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>