Changeset 2398
- Timestamp:
- 01/21/2010 04:34:05 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-core/bp-core-avatars.php
r2347 r2398 11 11 if ( !defined( 'BP_AVATAR_UPLOAD_PATH' ) ) 12 12 define( 'BP_AVATAR_UPLOAD_PATH', bp_core_avatar_upload_path() ); 13 14 if ( !defined( 'BP_AVATAR_URL' ) ) 15 define( 'BP_AVATAR_URL', bp_core_avatar_url() ); 13 16 14 17 if ( !defined( 'BP_AVATAR_THUMB_WIDTH' ) ) … … 102 105 $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"'; 103 106 104 $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, BP_AVATAR_UPLOAD_PATH ) . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );107 $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', str_replace( WP_CONTENT_DIR, BP_AVATAR_URL, BP_AVATAR_UPLOAD_PATH ) . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); 105 108 $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); 106 109 … … 273 276 274 277 /* Set the url value for the image */ 275 $bp->avatar_admin->image->url = str_replace( WP_CONTENT_DIR, WP_CONTENT_URL, $bp->avatar_admin->image->dir );278 $bp->avatar_admin->image->url = str_replace( WP_CONTENT_DIR, BP_AVATAR_URL, $bp->avatar_admin->image->dir ); 276 279 277 280 return true; … … 379 382 } 380 383 384 function bp_core_avatar_url() { 385 if ( !bp_core_is_multisite() ) 386 return WP_CONTENT_URL; 387 388 return apply_filters( 'bp_core_avatar_upload_path', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) ); 389 } 390 381 391 ?>
Note: See TracChangeset
for help on using the changeset viewer.