diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-08 00:27:49 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-08 00:27:49 +0000 |
| commit | c2516fa499ba6760664b03a65e5eff01c17ab15e (patch) | |
| tree | b22e447e20d8e8da4bcc5557b9d8a7f8584798db | |
| parent | ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8 (diff) | |
| download | forums-c2516fa499ba6760664b03a65e5eff01c17ab15e.tar forums-c2516fa499ba6760664b03a65e5eff01c17ab15e.tar.gz forums-c2516fa499ba6760664b03a65e5eff01c17ab15e.tar.bz2 forums-c2516fa499ba6760664b03a65e5eff01c17ab15e.tar.xz forums-c2516fa499ba6760664b03a65e5eff01c17ab15e.zip | |
avatar stuff
git-svn-id: file:///svn/phpbb/trunk@4214 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index beafc0ace1..deedf20f25 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -354,7 +354,7 @@ class ucp_profile extends ucp $data = array(); if (!empty($_FILES['uploadfile']['tmp_name']) && $can_upload) { - avatar_upload($data); + $this->error = avatar_upload($data); } else if (!empty($_POST['uploadurl']) && $can_upload) { @@ -365,7 +365,7 @@ class ucp_profile extends ucp ); $data = $this->normalise_data($_POST, $normalise); - avatar_upload($data); + $this->error = avatar_upload($data); } else if (!empty($_POST['remotelink']) && $auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) { @@ -378,14 +378,14 @@ class ucp_profile extends ucp ); $data = $this->normalise_data($_POST, $normalise); - avatar_remote($data); + $this->error = avatar_remote($data); } else if (!empty($_POST['delete']) && $auth->acl_get('u_chgavatar')) { $data['filename'] = $data['width'] = $data['height'] = ''; } - if (!sizeof($this->error)) + if (!$this->error) { // Do we actually have any data to update? if (sizeof($data)) @@ -440,7 +440,7 @@ class ucp_profile extends ucp $template->assign_vars(array( - 'ERROR' => (sizeof($this->error)) ? implode('<br />', $this->error) : '', + 'ERROR' => ($this->error) ? $this->error : '', 'AVATAR' => $avatar_img, 'AVATAR_SIZE' => $config['avatar_filesize'], |