Changeset 3081

Timestamp:

06/27/2010 03:20:23 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2470 props r-a-y

File:

• branches/1.2/bp-core/bp-core-avatars.php (modified) (3 diffs)

branches/1.2/bp-core/bp-core-avatars.php

@@ -171 +171 @@
         }
 
-        /* If no avatars have been uploaded for this item, display a gravatar */
+        // If no avatars could be found, try to display a gravatar
+
+        // Skips gravatar check if $no_grav is passed
         if ( !$no_grav ) {
+
+                // Set gravatar size
+                if ( $width )
+                        $grav_size = $width;
+                else if ( 'full' == $type )
+                        $grav_size = BP_AVATAR_FULL_WIDTH;
+                else if ( 'thumb' == $type )
+                        $grav_size = BP_AVATAR_THUMB_WIDTH;
+
+                // Set gravatar type
                 if ( empty( $bp->grav_default->{$object} ) )
                         $default_grav = 'wavatar';
                 else if ( 'mystery' == $bp->grav_default->{$object} )
-                        $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' );
+                        $default_grav = apply_filters( 'bp_core_mysteryman_src', BP_AVATAR_DEFAULT, $grav_size );
                 else
                         $default_grav = $bp->grav_default->{$object};
 
-                if ( $width ) $grav_size = $width;
-                else if ( 'full' == $type ) $grav_size = BP_AVATAR_FULL_WIDTH;
-                else if ( 'thumb' == $type ) $grav_size = BP_AVATAR_THUMB_WIDTH;
-
+                // Set gravatar object
                 if ( empty( $email ) ) {
                         if ( 'user' == $object ) {
@@ -192 +201 @@
                 }
 
+                // Set host based on if using ssl
                 if ( is_ssl() )
                         $host = 'https://secure.gravatar.com/avatar/';
@@ -197 +207 @@
                         $host = 'http://www.gravatar.com/avatar/';
 
-                $email = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
-                $gravatar = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&s=' . $grav_size;
+                // Filter gravatar vars
+                $email          = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
+                $gravatar       = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&s=' . $grav_size;
 
                 return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . $alt . '" class="' . $class . '"' . $css_id . $html_width . $html_height . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );