Changeset 2984

Timestamp:

05/03/2010 11:28:51 PM (14 years ago)

Author:

apeatling

Message:

Fixes #2317 props jjj

Location:

branches/1.2

Files:

• bp-core/bp-core-avatars.php (modified) (5 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/bp-core-signup.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

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

@@ -109 +109 @@
         $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"';
 
-    $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 );
+    $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', BP_AVATAR_URL . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
     $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
 
@@ -294 +294 @@
     /* We only want to handle one image after resize. */
     if ( empty( $bp->avatar_admin->resized ) )
-        $bp->avatar_admin->image->dir = $bp->avatar_admin->original['file'];
+        $bp->avatar_admin->image->dir = str_replace( BP_AVATAR_UPLOAD_PATH, '', $bp->avatar_admin->original['file'] );
     else {
-        $bp->avatar_admin->image->dir = $bp->avatar_admin->resized;
+        $bp->avatar_admin->image->dir = str_replace( BP_AVATAR_UPLOAD_PATH, '', $bp->avatar_admin->resized );
         @unlink( $bp->avatar_admin->original['file'] );
     }
 
     /* Set the url value for the image */
-    $bp->avatar_admin->image->url = str_replace( WP_CONTENT_DIR, BP_AVATAR_URL, $bp->avatar_admin->image->dir );
+    $bp->avatar_admin->image->url = BP_AVATAR_URL . $bp->avatar_admin->image->dir;
 
     return true;
@@ -334 +334 @@
         return false;
 
-    if ( !file_exists( WP_CONTENT_DIR . '/' . $original_file ) )
+    $original_file = BP_AVATAR_UPLOAD_PATH . $original_file;
+
+    if ( !file_exists( $original_file ) )
         return false;
 
     if ( !$item_id )
-        $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . dirname( $original_file ), $item_id, $object, $avatar_dir );
+        $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', dirname( $original_file ), $item_id, $object, $avatar_dir );
     else
         $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
@@ -363 +365 @@
 
     /* Crop the image */
-    $full_cropped = wp_crop_image( WP_CONTENT_DIR . $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_FULL_WIDTH, BP_AVATAR_FULL_HEIGHT, false, $avatar_folder_dir . '/' . $full_filename );
-    $thumb_cropped = wp_crop_image( WP_CONTENT_DIR . $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_THUMB_WIDTH, BP_AVATAR_THUMB_HEIGHT, false, $avatar_folder_dir . '/' . $thumb_filename );
+    $full_cropped = wp_crop_image( $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_FULL_WIDTH, BP_AVATAR_FULL_HEIGHT, false, $avatar_folder_dir . '/' . $full_filename );
+    $thumb_cropped = wp_crop_image( $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_THUMB_WIDTH, BP_AVATAR_THUMB_HEIGHT, false, $avatar_folder_dir . '/' . $thumb_filename );
 
     /* Remove the original */
-    @unlink( WP_CONTENT_DIR . $original_file );
+    @unlink( $original_file );
 
     return true;
@@ -414 +416 @@
 
 function bp_core_avatar_upload_path() {
-    if ( bp_core_is_multisite() )
-        $path = ABSPATH . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
-    else {
-        if ( !$path = get_option( 'upload_path' ) )
-            $path = WP_CONTENT_DIR . '/uploads';
-        else
-            $path = ABSPATH . $path;
-    }
-
-    return apply_filters( 'bp_core_avatar_upload_path', $path );
+    $upload_dir = wp_upload_dir();
+    return apply_filters( 'bp_core_avatar_upload_path', $upload_dir['basedir'] );
 }
 
 function bp_core_avatar_url() {
-    if ( !bp_core_is_multisite() )
-        return WP_CONTENT_URL;
-
-    return apply_filters( 'bp_core_avatar_url', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) );
+    $upload_dir = wp_upload_dir();
+    return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
 }
 

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

@@ -79 +79 @@
     global $bp;
 
-    $image = apply_filters( 'bp_inline_cropper_image', getimagesize( $bp->avatar_admin->image->dir ) );
+    $image = apply_filters( 'bp_inline_cropper_image', getimagesize( BP_AVATAR_UPLOAD_PATH . $bp->avatar_admin->image->dir ) );
     $aspect_ratio = 1;
 

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

@@ -520 +520 @@
         @wp_mkdir_p( $path );
 
-    $newurl = str_replace( BP_AVATAR_UPLOAD_PATH, BP_AVATAR_URL, $path );
+    $newurl = BP_AVATAR_URL . '/avatars/signups/' . $bp->signup->avatar_dir;
     $newburl = $newurl;
     $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;

branches/1.2/bp-groups.php

@@ -1860 +1860 @@
         @wp_mkdir_p( $path );
 
-    $newurl = str_replace( BP_AVATAR_UPLOAD_PATH, BP_AVATAR_URL, $path );
+    $newurl = BP_AVATAR_URL . '/group-avatars/' . $group_id;
     $newburl = $newurl;
     $newsubdir = '/group-avatars/' . $group_id;

branches/1.2/bp-xprofile.php

@@ -876 +876 @@
         @wp_mkdir_p( $path );
 
-    $newurl = str_replace( BP_AVATAR_UPLOAD_PATH, BP_AVATAR_URL, $path );
+    $newurl  = BP_AVATAR_URL . '/avatars/' . $user_id;
     $newburl = $newurl;
     $newsubdir = '/avatars/' . $user_id;