Changeset 167 for trunk/bp-xprofile/bp-xprofile-avatars.php

Timestamp:

06/19/08 17:10:30 (7 months ago)

Author:

apeatling

Message:

Fixed issues with subdirectory WPMU installations and BuddyPress

Files:

• trunk/bp-xprofile/bp-xprofile-avatars.php (modified) (6 diffs)

trunk/bp-xprofile/bp-xprofile-avatars.php

@@ -67 +67 @@
 
 // Main UI Rendering
-function xprofile_avatar_admin($message = null) {
+function xprofile_avatar_admin($message = null, $action = null) {
         ?>      
         <?php if ( !isset($_POST['slick_avatars_action']) && !isset($_GET['slick_avatars_action']) ) { ?>
@@ -84 +84 @@
                 
                 <?php
-                $action = get_option('home') . '/wp-admin/admin.php?page=bp-xprofile.php';
+                if ( !$action )
+                        $action = get_option('home') . '/wp-admin/admin.php?page=bp-xprofile.php';
+                
                 xprofile_render_avatar_upload_form($action);
 
@@ -128 +130 @@
                 
                 // Render the cropper UI
-                $action = get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php';
+                if ( !$action )
+                        $action = get_option('home') .'/wp-admin/admin.php?page=bp-xprofile.php';
+                
                 xprofile_render_avatar_cropper($original, $canvas, $action);
                 
@@ -224 +228 @@
 }
 
-function xprofile_render_avatar_cropper($original, $new, $action) {
+function xprofile_render_avatar_cropper($original, $new, $action, $user_id = null) {
         $size = getimagesize($new);
         
-        // Get the URL to access the uploaded file
-        $url = get_usermeta( get_current_user_id(), 'source_domain' );
+        if ( !$user_id )
+                $user_id = get_current_user_id();
+        
+        if ( VHOST == 'yes' ) {
+                $url = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/';
+        } else {
+                $url = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/' . get_usermeta( $user_id, 'nickname' ) . '/';
+        }
+
         $src = str_replace( array(ABSPATH), array($url . '/'), $new );
-        
+
         // Load cropper details
         
@@ -354 +365 @@
         if ( !$user_id )
                 $user_id = get_current_user_id();
+                
+        if ( VHOST == 'yes' ) {
+                $src = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/';
+        } else {
+                $src = 'http://' . get_usermeta( $user_id, 'source_domain' ) . '/' . get_usermeta( $user_id, 'nickname' ) . '/';
+        }
         
         $old = get_usermeta( $user_id, 'xprofile_avatar_v1_path' );
-        $v1_href = str_replace( array(ABSPATH), array( 'http://' . get_usermeta( get_current_user_id(), 'source_domain' ) . '/' ), $vars['v1_out'] );
+        $v1_href = str_replace( array(ABSPATH), array($src), $vars['v1_out'] );
         update_usermeta( $user_id, 'xprofile_avatar_v1', $v1_href );
         update_usermeta( $user_id, 'xprofile_avatar_v1_path', $vars['v1_out'] );
@@ -363 +380 @@
         if ( XPROFILE_AVATAR_V2_W !== false && XPROFILE_AVATAR_V2_H !== false ) {
                 $old = get_usermeta( $user_id, 'xprofile_avatar_v2_path' );
-                $v2_href = str_replace( array(ABSPATH), array( 'http://' . get_usermeta( get_current_user_id(), 'source_domain' ) . '/' ), $vars['v2_out'] );
+                $v2_href = str_replace( array(ABSPATH), array($src), $vars['v2_out'] );
                 update_usermeta( $user_id, 'xprofile_avatar_v2', $v2_href );
                 update_usermeta( $user_id, 'xprofile_avatar_v2_path', $vars['v2_out'] );