Ticket #1231: bp-core-avatars.patch

bp-core-avatars.php

@@ -123 +123 @@
                 return false;
         
         /* Set the file names to search for to select the full size or thumbnail image. */
-        $avatar_name = ( 'full' == $type ) ? '-bpfull' : '-bpthumb';    
-        $legacy_user_avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1';       
-        $legacy_group_avatar_name = ( 'full' == $type ) ? '-groupavatar-full' : '-groupavatar-thumb';   
+        $avatar_suffixes = array();
+        $avatar_suffixes[] = $avatar_name = ( 'full' == $type ) ? '-bpfull' : '-bpthumb';       
+        $avatar_suffixes[] = $legacy_user_avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1';  
+        $avatar_suffixes[] = $legacy_group_avatar_name = ( 'full' == $type ) ? '-groupavatar-full' : '-groupavatar-thumb';      
         
         if ( $av_dir = opendir( $avatar_folder_dir ) ) {
-            while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
-                        if ( preg_match( "/{$avatar_name}/", $avatar_file ) || preg_match( "/{$legacy_user_avatar_name}/", $avatar_file ) || preg_match( "/{$legacy_group_avatar_name}/", $avatar_file ) )
-                                $avatar_url = $avatar_folder_url . '/' . $avatar_file;
-            }
+                while ( is_null( $avatar_url ) && false !== ( list( $key, $avatar_suffix ) = each( $avatar_suffixes ) ) ) {
+                    while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
+                                if ( preg_match( "/{$avatar_suffix}/", $avatar_file ) ) {
+                                        $avatar_url = $avatar_folder_url . '/' . $avatar_file;
+                                        break;
+                                }
+                    }
+                        rewinddir($av_dir);
+                }
         }
-    closedir($av_dir);
+        closedir($av_dir);
 
         return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params ); 
 }