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

Change in function name

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4783 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2004-02-03 02:28:24 +00:00
parent 60d5712e15
commit 9b15f907dd
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/includes/ucp/ucp_profile.php
View file

@ -161,7 +161,7 @@ class ucp_profile extends module
// Need to update config, forum, topic, posting, messages, etc.
if ($username != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])
{
update_username($user->data['username'], $username);
user_update_name($user->data['username'], $username);
}
meta_refresh(3, "ucp.$phpEx$SID&i=$id&mode=$mode");
@ -493,21 +493,17 @@ class ucp_profile extends module
{
$data['user_id'] = $user->data['user_id'];
if (!empty($_FILES['uploadfile']['tmp_name']) && $can_upload)
if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload)
{
$data = avatar_upload($data, $error);
}
else if ($data['uploadurl'] && $can_upload)
{
$data = avatar_upload($data, $error);
list($type, $filename, $width, $height) = avatar_upload($data, $error);
}
else if ($data['remotelink'] && $auth->acl_get('u_chgavatar') && $config['allow_avatar_remote'])
{
$data = avatar_remote($data, $error);
list($type, $filename, $width, $height) = avatar_remote($data, $error);
}
else if ($delete && $auth->acl_get('u_chgavatar'))
{
$data['filename'] = $data['width'] = $data['height'] = '';
$type = $filename = $width = $height = '';
}
}
@ -517,10 +513,10 @@ class ucp_profile extends module
if (sizeof($data))
{
$sql_ary = array(
'user_avatar' => $data['filename'],
'user_avatar_type' => $data['type'],
'user_avatar_width' => $data['width'],
'user_avatar_height' => $data['height'],
'user_avatar' => $filename,
'user_avatar_type' => $type,
'user_avatar_width' => $width,
'user_avatar_height' => $height,
);
$sql = 'UPDATE ' . USERS_TABLE . '
@ -529,7 +525,7 @@ class ucp_profile extends module
$db->sql_query($sql);
// Delete old avatar if present
if ($user->data['user_avatar'] != '' && $data['filename'] != $user->data['user_avatar'])
if ($user->data['user_avatar'] && $filename != $user->data['user_avatar'])
{
avatar_delete($user->data['user_avatar']);
}