Changeset 2925 for trunk/bp-core/bp-core-avatars.php

Timestamp:

04/15/2010 11:59:40 AM (16 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk.

File:

• trunk/bp-core/bp-core-avatars.php (modified) (2 diffs)

trunk/bp-core/bp-core-avatars.php

@@ -155 +155 @@
                 }
 
+                if ( is_ssl() )
+                        $host = 'https://secure.gravatar.com/avatar/';
+                else
+                        $host = 'http://www.gravatar.com/avatar/';
+
                 $email = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
-                $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $email ) . '?d=' . $default_grav . '&s=' . $grav_size;
+                $gravatar = apply_filters( 'bp_gravatar_url', $host ) . md5( $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 );
@@ -389 +394 @@
                 if ( !$path = get_option( 'upload_path' ) )
                         $path = WP_CONTENT_DIR . '/uploads';
+                else
+                        $path = ABSPATH . $path;
         }