Changeset 3860

Timestamp:

01/24/2011 03:17:36 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Prevent debug notices if avatar directory does not exist and/or cannot be created

File:

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

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

@@ -574 +574 @@
         $upload_dir = wp_upload_dir();
 
-        // If multisite, and current blog does not match root blog, make adjustments
-        if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
-                $upload_dir['basedir'] = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
-
-        return apply_filters( 'bp_core_avatar_upload_path', $upload_dir['basedir'] );
+        // Directory does not exist and cannot be created
+        if ( isset( $upload_dir['baseurl'] ) ) {
+                $basedir = $upload_dir['baseurl'];
+
+                // If multisite, and current blog does not match root blog, make adjustments
+                if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
+                        $basedir = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
+        } else {
+                $basedir = '';
+        }
+
+        return apply_filters( 'bp_core_avatar_upload_path', $basedir );
 }
 
@@ -596 +603 @@
         $upload_dir = wp_upload_dir();
 
-        // If multisite, and current blog does not match root blog, make adjustments
-        if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
-                $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'] );
+        // Directory does not exist and cannot be created
+        if ( isset( $upload_dir['baseurl'] ) ) {
+                $baseurl = $upload_dir['baseurl'];
+
+                // If multisite, and current blog does not match root blog, make adjustments
+                if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
+                        $baseurl = trailingslashit( get_blog_option( BP_ROOT_BLOG, 'home' ) ) . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
+        } else {
+                $baseurl = '';
+        }
+
+        return apply_filters( 'bp_core_avatar_url', $baseurl );
 }