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

Timestamp:

11/25/2009 10:32:06 AM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch r2113 through r2119 into trunk.

File:

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

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

@@ -78 +78 @@
     }
 
-    if ( !$css_id )
-        $css_id = $object . '-' . $item_id . '-avatar';
+    /* Add an identifying class to each item */
+    $class .= ' ' . $object . '-' . $item_id . '-avatar';
+
+    if ( !empty($css_id) )
+        $css_id = " id='{$css_id}'";
 
     if ( $width )
@@ -113 +116 @@
 
         if ( $avatar_url )
-            return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
+            return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
     }
 
@@ -138 +141 @@
         $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $grav_email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
 
-        return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
+        return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
 
     } else {