makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

do not overwrite avatars from users if changing/uploading group avatar and changing/uploading avatar in ACP user panel (#1880)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5998 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-06-02 10:26:38 +00:00
parent 148fab6579
commit 6bce606202
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_user.php
View file

@ -962,7 +962,7 @@ function avatar_delete($id)
} }
return false; return false;
} }
/** /**
* Remote avatar linkage * Remote avatar linkage
@ -1039,7 +1039,7 @@ function avatar_upload($data, &$error)
$file = $upload->remote_upload($data['uploadurl']); $file = $upload->remote_upload($data['uploadurl']);
} }
$file->clean_filename('real', $user->data['user_id'] . '_'); $file->clean_filename('real', $data['user_id'] . '_');
$file->move_file($config['avatar_path']); $file->move_file($config['avatar_path']);
if (sizeof($file->error)) if (sizeof($file->error))