aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/functions_upload.php2
-rw-r--r--phpBB/includes/functions_user.php2
2 files changed, 3 insertions, 1 deletions
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'));
}
/**