Changeset 5455

Timestamp:

12/07/2011 02:31:53 AM (13 years ago)

Author:

boonebgorges

Message:

Pass alt and title parameters to bp_core_fetch_avatar() on group directory page, when possible. Fixes alt logic and reduces queries in bp_core_fetch_avatar(). See #3804

Location:

trunk

Files:

• bp-core/bp-core-avatars.php (modified) (3 diffs)
• bp-groups/bp-groups-template.php (modified) (1 diff)

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

@@ -89 +89 @@
     $def_type   = 'thumb';
     $def_class  = 'avatar';
-    $def_alt    = __( 'Avatar Image', 'buddypress' );
 
     // Set the default variables array
@@ -101 +100 @@
         'class'      => $def_class,  // Custom <img> class (string)
         'css_id'     => false,       // Custom <img> ID (string)
-        'alt'        => $def_alt,    // Custom <img> alt (string)
+        'alt'        => '',          // Custom <img> alt (string)
         'email'      => false,       // Pass the user email (for gravatar) to prevent querying the DB for it
         'no_grav'    => false,       // If there is no avatar found, return false instead of a grav?
@@ -148 +147 @@
     $item_name = '';
 
-    if ( 'user' == $object )
-        $item_name = bp_core_get_user_displayname( $item_id );
-    elseif ( 'group' == $object )
-        $item_name = bp_get_group_name( groups_get_group( array( 'group_id' => $item_id ) ) );
-    elseif ( 'blog' == $object )
-        $item_name = get_blog_option( $item_id, 'blogname' );
-
-    $alt = sprintf( $alt, apply_filters( 'bp_core_avatar_alt', $item_name, $item_id, $object ) );
+    // Don't do this query if we don't have to
+    if ( !$alt || !$title ) {
+        if ( 'user' == $object )
+            $item_name = bp_core_get_user_displayname( $item_id );
+        elseif ( 'group' == $object )
+            $item_name = bp_get_group_name( groups_get_group( array( 'group_id' => $item_id ) ) );
+        elseif ( 'blog' == $object )
+            $item_name = get_blog_option( $item_id, 'blogname' );
+    }
+
+    if ( !$alt && $item_name ) {
+        $alt = sprintf( __( "Avatar Image: %s", 'buddypress' ), apply_filters( 'bp_core_avatar_alt', $item_name, $item_id, $object ) );
+    } elseif ( !$alt ) {
+        $alt = __( 'Avatar Image', 'buddypress' );
+    }
 
     // Set title tag

trunk/bp-groups/bp-groups-template.php

@@ -394 +394 @@
 
         /* Fetch the avatar from the folder, if not provide backwards compat. */
-        if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height ) ) )
+        if ( !$avatar = bp_core_fetch_avatar( array( 'item_id' => $groups_template->group->id, 'object' => 'group', 'type' => $type, 'avatar_dir' => 'group-avatars', 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'title' => $groups_template->group->name, 'alt' => $groups_template->group->name ) ) )
             $avatar = '<img src="' . esc_attr( $groups_template->group->avatar_thumb ) . '" class="avatar" alt="' . esc_attr( $groups_template->group->name ) . '" />';