From 5e7a80cbd836a9f5daff45076a4ba02abd3c85a6 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 3 May 2007 09:27:02 +0000 Subject: [PATCH] Still finetuning avatar uploading and delivery. Remember that the recent changes broke compatibility with old uploaded avatars and that there were changes to the database entries. git-svn-id: file:///svn/phpbb/trunk@7453 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_upload.php | 2 ++ phpBB/includes/functions_user.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 92c6b1a938..99d321ede9 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -111,7 +111,9 @@ class filespec break; case 'avatar': + $this->extension = strtolower($this->extension); $this->realname = $prefix . $user_id . '.' . $this->extension; + break; case 'unique_ext': diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 69990a9524..b41b329cce 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1642,7 +1642,7 @@ function avatar_upload($data, &$error) $error = array_merge($error, $file->error); } - return array(AVATAR_UPLOAD, $data['user_id'] . '_' . substr(time(), -5) . '.' . $file->get('extension'), $file->get('width'), $file->get('height')); + return array(AVATAR_UPLOAD, $data['user_id'] . '_' . time() . '.' . $file->get('extension'), $file->get('width'), $file->get('height')); } /**