Changeset 5466

Timestamp:

12/09/2011 01:17:57 AM (13 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

Location:

trunk

Files:

• bp-core/bp-core-avatars.php (modified) (2 diffs)
• bp-members/bp-members-adminbar.php (modified) (2 diffs)
• bp-members/bp-members-buddybar.php (modified) (1 diff)
• bp-members/bp-members-loader.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (3 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

trunk/bp-members/bp-members-adminbar.php

@@ -33 +33 @@
             'email'   => $bp->loggedin_user->userdata->user_email,
             'width'   => 16,
-            'height'  => 16
+            'height'  => 16,
+            'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_loggedin_user_fullname() )
         ) );
 
@@ -112 +113 @@
         'email'   => $bp->displayed_user->userdata->user_email,
         'width'   => 16,
-        'height'  => 16
+        'height'  => 16,
+        'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
     ) );
 

trunk/bp-members/bp-members-buddybar.php

@@ -70 +70 @@
             echo '<li>';
             echo '<a href="' . bp_core_get_user_domain( $author->user_id, $author->user_nicename, $author->user_login ) . '">';
-            echo bp_core_fetch_avatar( array( 'item_id' => $author->user_id, 'email' => $author->user_email, 'width' => 15, 'height' => 15 ) ) ;
+            echo bp_core_fetch_avatar( array( 
+                'item_id' => $author->user_id, 
+                'email'   => $author->user_email, 
+                'width'   => 15, 
+                'height'  => 15, 
+                'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $author->display_name )
+            ) );
             echo ' ' . $author->display_name . '</a>';
             echo '<div class="admin-bar-clear"></div>';

trunk/bp-members/bp-members-loader.php

@@ -179 +179 @@
             $bp->bp_options_avatar = bp_core_fetch_avatar( array(
                 'item_id' => bp_displayed_user_id(),
-                'type'    => 'thumb'
+                'type'    => 'thumb',
+                'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
             ) );
             $bp->bp_options_title  = $bp->displayed_user->fullname;

trunk/bp-members/bp-members-template.php

@@ -480 +480 @@
             'class' => 'avatar',
             'id' => false,
-            'alt' => __( 'Profile picture of %s', 'buddypress' )
+            'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $members_template->member->fullname )
         );
 
@@ -776 +776 @@
             'height' => false,
             'html'   => true,
-            'alt'    => __( 'Profile picture of %s', 'buddypress' )
+            'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_loggedin_user_fullname() )
         );
 
@@ -796 +796 @@
             'height' => false,
             'html'   => true,
-            'alt'    => __( 'Profile picture of %s', 'buddypress' )
+            'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
         );