Changeset 5898

Timestamp:

03/09/2012 04:05:59 PM (15 years ago)

Author:

boonebgorges

Message:

Switch to root blog to get avatar upload directory in bp_core_avatar_upload_path().
Fixes problem that prevented locally-uploaded avatars from appearing properly on non-root sites.
Fixes #2574

File:

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

branches/1.5/bp-core/bp-core-avatars.php

@@ -663 +663 @@
                         $basedir = BP_AVATAR_UPLOAD_PATH;
                 } else {
+                        if ( !bp_is_root_blog() ) {
+                                // Switch dynamically in order to support BP_ENABLE_MULTIBLOG
+                                switch_to_blog( bp_get_root_blog_id() );
+                        }
+                        
                         // Get upload directory information from current site
                         $upload_dir = wp_upload_dir();
@@ -672 +677 @@
                         } else {
                                 $basedir = $upload_dir['basedir'];
-                
-                                // If multisite, and current blog does not match root blog, make adjustments
-                                if ( is_multisite() && bp_get_root_blog_id() != get_current_blog_id() )
-                                        $basedir = get_blog_option( bp_get_root_blog_id(), 'upload_path' );
                         }
+                        
+                        // Will bail if not switched
+                        restore_current_blog();
                 }