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

Timestamp:

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

Author:

apeatling

Message:

Signup avatar upload fixes and DB fixes.

File:

• trunk/bp-core/bp-core-templatetags.php (modified) (1 diff)

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

@@ -828 +828 @@
                 $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 ) ) {
+                if ( empty( $signup_avatar_dir ) ) {
+                        if ( empty( $bp->grav_default->user ) ) {
                                 $default_grav = 'wavatar';
-                        } else if ( 'mystery' == $bp->grav_default ) {
+                        } else if ( 'mystery' == $bp->grav_default->user ) {
                                 $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
                         } else {
-                                $default_grav = $bp->grav_default;
+                                $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 . '" />';
+                        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 ) ) );