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

Timestamp:

12/09/2011 01:17:57 AM (14 years ago)

Author:

boonebgorges

Message:

Deemphasizes sprintf() type 'alt' parameters for bp_core_fetch_avatar(), in order to avoid unnecessary database queries when loading avatars. Modifies calls throughout bp_core_fetch_avatar() so that they pass literal strings as 'alt' parameters. See #3806

File:

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

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

@@ -146 +146 @@
     // Get item name for alt/title tags
     $item_name = '';
-
-    // Don't do this query if we don't have to
-    if ( !$alt || !$title ) {
+    
+    // Backpat for the 'alt' parameter, which used to encourage sprintf()-style values
+    if ( false !== strpos( $alt, '%s' ) || false !== strpos( $alt, '%1$s' ) ) {
+        var_dump( 'yes' );
         if ( 'user' == $object )
             $item_name = bp_core_get_user_displayname( $item_id );
@@ -155 +156 @@
         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 = sprintf( $alt, apply_filters( 'bp_core_avatar_alt', $item_name, $item_id, $object ) );
+    }
+
+    // Get a fallback for the 'alt' parameter   
+    if ( !$alt ) {
         $alt = __( 'Avatar Image', 'buddypress' );
     }
 
-    // Set title tag
+    // Set title tag, if it's been provided
     if ( $title )
         $title = " title='" . esc_attr( apply_filters( 'bp_core_avatar_title', $title, $item_id, $object ) ) . "'";
-    elseif ( $item_name )
-        $title = " title='" . esc_attr( apply_filters( 'bp_core_avatar_title', $item_name, $item_id, $object ) ) . "'";
 
     // Set CSS ID if passed