Changeset 1714 for trunk/bp-core/bp-core-signup.php

Timestamp:

08/27/2009 05:43:08 PM (15 years ago)

Author:

apeatling

Message:

Signup avatar upload fixes and DB fixes.

File:

• trunk/bp-core/bp-core-signup.php (modified) (4 diffs)

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

@@ -138 +138 @@
 
     $bp->avatar_admin->step = 'upload-image';
-    
+
     /* If user has uploaded a new avatar */
     if ( !empty( $_FILES ) ) {
@@ -144 +144 @@
         /* Check the nonce */
         check_admin_referer( 'bp_avatar_upload' );
+
+        $bp->signup->step = 'completed-confirmation';
         
         /* Get the activation key */
@@ -152 +154 @@
             $bp->signup->avatar_dir = wp_hash( $bp->signup->key );
             
-            /* Pass the file to the avatar upload handler */
-            $errors = bp_core_avatar_handle_upload( $_FILES, 'bp_core_signup_avatar_upload_dir' );
-
-            if ( !$errors ) {
-                $bp->signup->step = 'completed-confirmation';
+            /* Pass the file to the avatar upload handler */        
+            if ( bp_core_avatar_handle_upload( $_FILES, 'bp_core_signup_avatar_upload_dir' ) ) {        
                 $bp->avatar_admin->step = 'crop-image';
 
                 /* Make sure we include the jQuery jCrop file for image cropping */
                 add_action( 'wp', 'bp_core_add_jquery_cropper' );
-            }
+            }           
         }
     }
@@ -191 +190 @@
         return false;
     
-    $path  = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
+    $path = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
     $newdir = path_join( ABSPATH, $path );
     $newdir .= '/avatars/signups/' . $bp->signup->avatar_dir;