diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-28 18:01:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-28 18:01:15 +0000 |
| commit | ceb03a380403107da362e18e088ed0754fecfedd (patch) | |
| tree | ef2461d4d858aa6c240c97433269eae4a2bafd07 | |
| parent | 1aed382e524261cf86f078d1e2814dc9cb7b1994 (diff) | |
| download | forums-ceb03a380403107da362e18e088ed0754fecfedd.tar forums-ceb03a380403107da362e18e088ed0754fecfedd.tar.gz forums-ceb03a380403107da362e18e088ed0754fecfedd.tar.bz2 forums-ceb03a380403107da362e18e088ed0754fecfedd.tar.xz forums-ceb03a380403107da362e18e088ed0754fecfedd.zip | |
(hopefully) fixed the error display for uploading avatars (if avatar is too big)
git-svn-id: file:///svn/phpbb/trunk@5749 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions_upload.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 2b4e680e54..ca2ef1517f 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -278,7 +278,7 @@ class filespec if (!$this->upload->valid_dimensions($this)) { - $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'WRONG_SIZE'], $this->min_width, $this->min_height, $this->max_width, $this->max_height); + $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'WRONG_SIZE'], $this->upload->min_width, $this->upload->min_height, $this->upload->max_width, $this->upload->max_height); } } } @@ -532,6 +532,7 @@ class fileupload $url['path'] = explode('.', $url['path']); $ext = array_pop($url['path']); + $url['path'] = implode('', $url['path']); $upload_ary['name'] = basename($url['path']) . (($ext) ? '.' . $ext : ''); $filename = $url['path']; $filesize = 0; diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 6468e2f11b..0b0adbcee5 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -992,13 +992,13 @@ function avatar_remote($data, &$error) } else if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height']) { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_max_width'], $config['avatar_max_height']); + $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height']); return false; } } else if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_max_width'], $config['avatar_max_height']); + $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height']); return false; } |