Changeset 2609

Timestamp:

02/05/2010 03:09:16 PM (14 years ago)

Author:

apeatling

Message:

Fixes #1817

Location:

trunk/bp-core

Files:

• bp-core-activation.php (modified) (1 diff)
• bp-core-signup.php (modified) (1 diff)
• bp-core-templatetags.php (modified) (1 diff)

trunk/bp-core/bp-core-activation.php

@@ -45 +45 @@
 
         /* Check if the avatar folder exists. If it does, move rename it, move it and delete the signup avatar dir */
-        if ( file_exists( WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/signups/' . $hashed_key ) ) {
-            @rename( WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/signups/' . $hashed_key, WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/avatars/' . $signup['user_id'] );
+        if ( file_exists( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $hashed_key ) ) {
+            @rename( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $hashed_key, BP_AVATAR_UPLOAD_PATH . '/avatars/' . $signup['user_id'] );
         }
 

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

@@ -186 +186 @@
             bp_core_add_message( __( 'Your new avatar was uploaded successfully', 'buddypress' ) );
 
+        /* If this is a single WP install, move the avatar to the user's folder since there is no activation process to move it. */
+        if ( !bp_core_is_multisite() ) {
+            $user_id = bp_core_get_userid( $_POST['signup_username'] );
+
+            if ( !empty( $user_id ) && file_exists( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $_POST['signup_avatar_dir'] ) ) {
+                @rename( BP_AVATAR_UPLOAD_PATH . '/avatars/signups/' . $_POST['signup_avatar_dir'], BP_AVATAR_UPLOAD_PATH . '/avatars/' . $user_id );
+            }
+        }
     }
     bp_core_load_template( 'registration/register' );

trunk/bp-core/bp-core-templatetags.php

@@ -1226 +1226 @@
         extract( $r, EXTR_SKIP );
 
-        $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
-
-        if ( empty( $signup_avatar_dir ) ) {
-            if ( empty( $bp->grav_default->user ) ) {
-                $default_grav = 'wavatar';
-            } else if ( 'mystery' == $bp->grav_default->user ) {
-                $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
+        if ( !bp_core_is_multisite() && !empty( $_POST['signup_username'] ) ) {
+            $user_id = bp_core_get_userid( $_POST['signup_username'] );
+            return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
+        } else {
+            $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
+
+            if ( empty( $signup_avatar_dir ) ) {
+                if ( empty( $bp->grav_default->user ) ) {
+                    $default_grav = 'wavatar';
+                } else if ( 'mystery' == $bp->grav_default->user ) {
+                    $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
+                } else {
+                    $default_grav = $bp->grav_default->user;
+                }
+
+                $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
+                return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
             } else {
-                $default_grav = $bp->grav_default->user;
+                return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
             }
-
-            $gravatar_url = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' );
-            return apply_filters( 'bp_get_signup_avatar', '<img src="' . $gravatar_url . md5( $_POST['signup_email'] ) . '?d=' . $default_grav . '&amp;s=' . $size ) . '" width="' . $size . '" height="' . $size . '" alt="' . $alt . '" class="' . $class . '" />';
-        } else {
-            return apply_filters( 'bp_get_signup_avatar', bp_core_fetch_avatar( array( 'item_id' => $signup_avatar_dir, 'object' => 'signup', 'avatar_dir' => 'avatars/signups', 'type' => 'full', 'width' => $size, 'height' => $size, 'alt' => $alt, 'class' => $class ) ) );
         }
     }