Changeset 1709

Timestamp:

08/26/2009 06:18:56 PM (17 years ago)

Author:

apeatling

Message:

Updating legacy group avatar support.

Location:

trunk

Files:

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

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

@@ -125 +125 @@
         if ( $av_dir = opendir( $avatar_folder_dir ) ) {
             while ( false !== ( $avatar_file = readdir($av_dir) ) ) {
-                        if ( preg_match( "/{$avatar_name}/", $avatar_file ) || preg_match( "/{$avatar_name}/", $legacy_user_avatar_file ) || preg_match( "/{$avatar_name}/", $legacy_group_avatar_file ) )
+                        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;
             }

trunk/bp-groups.php

@@ -74 +74 @@
         
         foreach ( $groups as $group ) {
-                /* Don't fetch and move gravs */
-                if ( strpos( $group->avatar_thumb, 'gravatar.com' ) )
+                /* Don't fetch and move gravs, default images or empties */
+                if ( empty($group->avatar_thumb) || strpos( $group->avatar_thumb, 'gravatar.com' ) || strpos( $group->avatar_thumb, 'identicon' ) || strpos( $group->avatar_thumb, 'none-thumbnail' ) )
                         continue;
 
-                $upload_dir = groups_avatar_upload_dir( $group->id );
-                $avatar_thumb = str_replace( $bp->root_domain . '/' . basename( WP_CONTENT_DIR ), WP_CONTENT_PATH, $group->avatar_thumb );
-                $avatar_full = str_replace( $bp->root_domain . '/' . basename( WP_CONTENT_DIR ), WP_CONTENT_PATH, $group->avatar_full );
-
-                copy( $avatar_thumb, $upload_dir['path'] . '/' . basename($avatar_thumb) );
-                copy( $avatar_full, $upload_dir['path'] . '/' . basename($avatar_full) );
+                $start = strpos( $group->avatar_thumb, 'blogs.dir' );
+
+                if ( false !== $start ) {
+                        $avatar_thumb = WP_CONTENT_DIR . '/' . substr( $group->avatar_thumb, $start, strlen( $group->avatar_thumb ) );
+                        $avatar_full = WP_CONTENT_DIR . '/' . substr( $group->avatar_full, $start, strlen( $group->avatar_full ) );
+
+                        if ( !file_exists( $avatar_thumb ) || !file_exists( $avatar_full ) )
+                                continue;
+                        
+                        $upload_dir = groups_avatar_upload_dir( $group->id );
+
+                        copy( $avatar_thumb, $upload_dir['path'] . '/' . basename($avatar_thumb) );
+                        copy( $avatar_full, $upload_dir['path'] . '/' . basename($avatar_full) );
+                }
         }