Ticket #4503: 4503-2.diff

bp-core/bp-core-avatars.php

@@ -220 +220 @@
         if ( empty( $alt ) )
                 $alt = __( 'Avatar Image', 'buddypress' );
 
+        $html_alt = ' alt="' . esc_attr( $alt ) . '"';
+
         // Set title tag, if it's been provided
         if ( !empty( $title ) )
                 $title = " title='" . esc_attr( apply_filters( 'bp_core_avatar_title', $title, $item_id, $object, $params ) ) . "'";
 
         // Set CSS ID if passed
         if ( !empty( $css_id ) )
-                $css_id = ' id="' . $css_id . '"';
+                $css_id = ' id="' . esc_attr( $css_id ) . '"';
 
-        // Set image width
-        if ( false !== $width )
-                $html_width = ' width="' . $width . '"';
-        else
-                $html_width = ( 'thumb' == $type ) ? ' width="' . bp_core_avatar_thumb_width() . '"' : ' width="' . bp_core_avatar_full_width() . '"';
+        // set the image width variable
+        if ( false !== $width ) {
+                $width = $width;
+        } elseif ( 'thumb' == $type ) {
+                $width = bp_core_avatar_thumb_width();
+        } else {
+                $width = bp_core_avatar_full_width();
+        }
+
+        // Set html width attribute
+        $html_width = ' width="' . esc_attr( $width ) . '"';
+
+        // Set the image height variable
+        if ( false !== $height ) {
+                $height = $height;
+        } elseif ( 'thumb' == $type ) {
+                $height = bp_core_avatar_thumb_height();
+        } else {
+                $height = bp_core_avatar_full_height();
+        }
+
+        $html_height = ' height="' . esc_attr( $height ) . '"';
 
-        // Set image height
-        if ( false !== $height )
-                $html_height = ' height="' . $height . '"';
-        else
-                $html_height = ( 'thumb' == $type ) ? ' height="' . bp_core_avatar_thumb_height() . '"' : ' height="' . bp_core_avatar_full_height() . '"';
 
         // Set img URL and DIR based on prepopulated constants
         $avatar_loc        = new stdClass();
@@ -250 +264 @@
         $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', ( $avatar_loc->path . $avatar_loc->dir . $item_id ), $item_id, $object, $avatar_dir );
 
         // Add an identifying class
-        $class .= ' ' . $object . '-' . $item_id . '-avatar';
+        $class .= ' ' . $object . '-' . $item_id . '-avatar ' . sanitize_html_class( "avatar-$width" ) . ' photo';
 
         /****
          * Look for uploaded avatar first. Use it if it exists.
@@ -314 +328 @@
 
                         // Return it wrapped in an <img> element
                         if ( true === $html ) {
-                                return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $avatar_url . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+                                return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $avatar_url . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $html_alt . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
 
                         // ...or only the URL
                         } else {
@@ -376 +390 @@
         }
 
         if ( true === $html )
-                return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+                return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $html_alt . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
         else
                 return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
 }