summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-07-17 11:30:01 +0000
committerDries Buytaert <dries@buytaert.net>2010-07-17 11:30:01 +0000
commit7175aab4f9a7740c2657341fe249b3a4b16abcfa (patch)
treeff258e2876ba6930daa7d6e122be5479814b9ff7 /modules/user/user.module
parent574afc8e9e633468c019d2eaf344794d69a75dfb (diff)
downloadbrdo-7175aab4f9a7740c2657341fe249b3a4b16abcfa.tar.gz
brdo-7175aab4f9a7740c2657341fe249b3a4b16abcfa.tar.bz2
- Patch #668058 by andypost, mrbubbs: resubmitting a user picture does show the first uploaded picture.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 226f2f152..c07aa1461 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -437,9 +437,9 @@ function user_save($account, $edit = array(), $category = 'account') {
// Prepare the pictures directory.
file_prepare_directory($picture_directory, FILE_CREATE_DIRECTORY);
- $destination = file_stream_wrapper_uri_normalize($picture_directory . '/picture-' . $account->uid . '.' . $info['extension']);
+ $destination = file_stream_wrapper_uri_normalize($picture_directory . '/picture-' . $account->uid . '-' . REQUEST_TIME . '.' . $info['extension']);
- if ($picture = file_move($picture, $destination, FILE_EXISTS_REPLACE)) {
+ if ($picture = file_move($picture, $destination, FILE_EXISTS_RENAME)) {
$picture->status |= FILE_STATUS_PERMANENT;
$edit['picture'] = file_save($picture);
}