Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 21:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Keep old versions of avatars in the filesystem. Change the avatar URL each time a new one is uploaded to avoid caching problems. Closes #4722.

Browse Source
This commit is contained in:
Ben Lubar
2016-07-28 12:21:37 -05:00
parent e7386e20cf
commit 0d40542f93
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/user/picture.js
View File

@@ -42,7 +42,7 @@ module.exports = function(User) {
return plugins.fireHook('filter:uploadImage', {image: picture, uid: updateUid}, next);
}
var filename = updateUid + '-profileimg' + (convertToPNG ? '.png' : extension);
var filename = updateUid + '-profileimg-' + Date.now() + (convertToPNG ? '.png' : extension);
async.waterfall([
function(next) {
@@ -68,21 +68,7 @@ module.exports = function(User) {
});
},
function(next) {
User.getUserField(updateUid, 'uploadedpicture', next);
},
function(oldpicture, next) {
if (!oldpicture) {
return file.saveFileToLocal(filename, 'profile', picture.path, next);
}
var oldpicturePath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), 'profile', path.basename(oldpicture));
fs.unlink(oldpicturePath, function (err) {
if (err) {
winston.error(err);
}
file.saveFileToLocal(filename, 'profile', picture.path, next);
});
file.saveFileToLocal(filename, 'profile', picture.path, next);
},
], next);
},
@@ -181,7 +167,7 @@ module.exports = function(User) {
return plugins.fireHook('filter:uploadImage', {image: image, uid: data.uid}, next);
}
var filename = data.uid + '-profilecover';
var filename = data.uid + '-profilecover-' + Date.now();
async.waterfall([
function (next) {
file.isFileTypeAllowed(data.file.path, next);