Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-15 17:10:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix convert-avatars-to-png option not being honored

Browse Source
This commit is contained in:
Ben Lubar
2016-04-21 15:54:23 -05:00
parent 178b9c3bdd
commit 74a5a70969
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/user/picture.js
View File

@@ -57,11 +57,13 @@ module.exports = function(User) {
}, next);
},
function(next) {
if (convertToPNG) {
image.normalise(picture.path, extension, next);
} else {
next();
if (!convertToPNG) {
return next();
}
async.series([
async.apply(image.normalise, picture.path, extension),
async.apply(fs.rename, picture.path + '.png', picture.path)
], next);
},
function(next) {
User.getUserField(updateUid, 'uploadedpicture', next);
@@ -225,4 +227,4 @@ module.exports = function(User) {
User.removeCoverPicture = function(data, callback) {
db.deleteObjectField('user:' + data.uid, 'cover:url', callback);
};
};
};