From 56757c72bbcbd0af6dc63df522936cb115a15b1e Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 5 Aug 2009 22:26:49 -0500 Subject: [PATCH] Fixed user picture in whoisonline.php when using users subdirs --- main/inc/lib/usermanager.lib.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) mode change 100644 => 100755 main/inc/lib/usermanager.lib.php diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php old mode 100644 new mode 100755 index 718eeb1117..6a324f0bc0 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -1914,9 +1914,11 @@ class UserManager { $picture['file'] = api_get_path(WEB_CODE_PATH).'img/'.$picture_file; return $picture; } - $file = api_get_path(SYS_CODE_PATH).$patch_profile.$user_id.'/'.$size_picture.$picture_file; + $image_array_sys=UserManager::get_user_picture_path_by_id($user_id,'system',false,true); + $image_array=UserManager::get_user_picture_path_by_id($user_id,'web',false,true); + $file = $image_array_sys['dir'].$size_picture.$picture_file; if (file_exists($file)) { - $picture['file'] = api_get_path(WEB_CODE_PATH).$patch_profile.$user_id.'/'.$size_picture.$picture_file; + $picture['file'] = $image_array['dir'].$size_picture.$picture_file; $picture['style']=''; if ($height > 0) { $dimension = @getimagesize(api_url_to_local_path($picture['file'])); @@ -1924,13 +1926,15 @@ class UserManager { $picture['style'] = ' style="padding-top:'.$margin.'px; width:'.$dimension[0].'px; height:'.$dimension[1].';" '; } } else { - $file = api_get_path(SYS_CODE_PATH).$patch_profile.$user_id.'/'.$picture_file; + //$file = api_get_path(SYS_CODE_PATH).$patch_profile.$user_id.'/'.$picture_file; + $file = $image_array_sys['dir'].$picture_file; if (file_exists($file)) { - $picture['file'] = api_get_path(WEB_CODE_PATH).$patch_profile.$user_id.'/'.$picture_file; + $picture['file'] = $image_array['dir'].$picture_file; } else { $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg'; } } + return $picture; } /**