Changeset 3851

Timestamp:

01/23/2011 09:44:54 PM (14 years ago)

Author:

djpaul

Message:

Fix URL to uploaded avatars on non-BP_ROOT_BLOG sites. Fixes #2451, #2574 and #2968. (branch)

File:

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

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

@@ -568 +568 @@
     // If multisite, and current blog does not match root blog, make adjustments
     if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
-        $upload_dir['baseurl'] = str_replace( get_blog_option( $current_blog->blog_id, 'home' ) , get_blog_option( BP_ROOT_BLOG, 'home' ), $upload_dir['baseurl'] );
+        $upload_dir['baseurl'] = trailingslashit( get_blog_option( BP_ROOT_BLOG, 'home' ) ) . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
 
     return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );