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

Timestamp:

08/26/2009 05:34:00 PM (17 years ago)

Author:

apeatling

Message:

Fixing missing slash and adding legacy group and user avatar support to fetch_avatar function.

File:

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

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

@@ -89 +89 @@
     $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', $bp->root_domain . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );   
     $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );    
-
+    
     /* If no avatars have been uploaded for this item, display a gravatar */    
     if ( !file_exists( $avatar_folder_dir ) && !$no_grav ) {
@@ -120 +120 @@
     /* 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';   
     
     if ( $av_dir = opendir( $avatar_folder_dir ) ) {
         while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
-            if ( preg_match( "/{$avatar_name}/", $avatar_file ) )
+            if ( preg_match( "/{$avatar_name}/", $avatar_file ) || preg_match( "/{$avatar_name}/", $legacy_user_avatar_file ) || preg_match( "/{$avatar_name}/", $legacy_group_avatar_file ) )
                 $avatar_url = $avatar_folder_url . '/' . $avatar_file;
         }
@@ -129 +131 @@
     closedir($av_dir);
 
-    /* If no avatar is found, check for the legacy file names of '-avatar1' and '-avatar2' */
-    if ( !$avatar_url && 'user' == $object ) {
-        if ( $av_dir = opendir( $avatar_folder_dir ) ) {
-            $avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1';   
-        
-            while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
-                if ( preg_match( "/{$avatar_name}/", $avatar_file ) )
-                    $avatar_url = $avatar_folder_url . '/' . $avatar_file;
-            }
-        }
-        closedir($av_dir);
-    }
-
-    return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$html_width}{$html_height} />", $params );    
+    return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params ); 
 }