diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-02 10:26:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-02 10:26:38 +0000 |
| commit | 6bce6062025f4bfca5146a2072ec3bbce614c2a9 (patch) | |
| tree | f37fc19315e57f21ec19fbb9663e3c04aafbd033 /phpBB/includes | |
| parent | 148fab6579bc7d12d32a9d17f1031c7457d4f89f (diff) | |
| download | forums-6bce6062025f4bfca5146a2072ec3bbce614c2a9.tar forums-6bce6062025f4bfca5146a2072ec3bbce614c2a9.tar.gz forums-6bce6062025f4bfca5146a2072ec3bbce614c2a9.tar.bz2 forums-6bce6062025f4bfca5146a2072ec3bbce614c2a9.tar.xz forums-6bce6062025f4bfca5146a2072ec3bbce614c2a9.zip | |
do not overwrite avatars from users if changing/uploading group avatar and changing/uploading avatar in ACP user panel (#1880)
git-svn-id: file:///svn/phpbb/trunk@5998 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index a012415643..fe311061fd 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -962,7 +962,7 @@ function avatar_delete($id) } return false; - } +} /** * Remote avatar linkage @@ -1039,7 +1039,7 @@ function avatar_upload($data, &$error) $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']); if (sizeof($file->error)) |